From 4964ecf1518d0c7a48e83445932bf5236862af4e Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 9 Jul 2020 06:07:11 -0500 Subject: [PATCH] style: update cli fns --- src/cli/find-config.ts | 4 ++-- src/cli/load-compiler.ts | 4 ++-- src/cli/logs.ts | 12 ++++++------ src/cli/parse-flags.ts | 12 ++++++------ src/cli/task-docs.ts | 4 ++-- src/cli/task-generate.ts | 4 ++-- src/cli/task-help.ts | 4 ++-- src/cli/task-info.ts | 4 ++-- src/cli/task-prerender.ts | 10 +++++----- src/cli/task-serve.ts | 4 ++-- src/cli/task-test.ts | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/cli/find-config.ts b/src/cli/find-config.ts index 0dd64087986..659fd6d6147 100644 --- a/src/cli/find-config.ts +++ b/src/cli/find-config.ts @@ -1,7 +1,7 @@ import type { CompilerSystem, Diagnostic } from '../declarations'; import { isString, normalizePath, buildError } from '@utils'; -export async function findConfig(opts: { sys: CompilerSystem; configPath: string }) { +export const findConfig = async (opts: { sys: CompilerSystem; configPath: string }) => { const sys = opts.sys; const cwd = sys.getCurrentDirectory(); const results = { @@ -51,4 +51,4 @@ export async function findConfig(opts: { sys: CompilerSystem; configPath: string } return results; -} +}; diff --git a/src/cli/load-compiler.ts b/src/cli/load-compiler.ts index ccfd3e5b7a6..3b0bc049ee2 100644 --- a/src/cli/load-compiler.ts +++ b/src/cli/load-compiler.ts @@ -1,9 +1,9 @@ import type { CompilerSystem } from '../declarations'; -export async function loadCoreCompiler(sys: CompilerSystem): Promise { +export const loadCoreCompiler = async (sys: CompilerSystem): Promise => { await sys.dynamicImport(sys.getCompilerExecutingPath()); return (globalThis as any).stencil; -} +}; export type CoreCompiler = typeof import('@stencil/core/compiler'); diff --git a/src/cli/logs.ts b/src/cli/logs.ts index 39fa77d875e..4fa03bf529f 100644 --- a/src/cli/logs.ts +++ b/src/cli/logs.ts @@ -2,7 +2,7 @@ import type { Config, Logger, ConfigFlags, CompilerSystem } from '../declaration import type { CoreCompiler } from './load-compiler'; import { version, vermoji } from '../version'; -export function startupLog(logger: Logger, flags: ConfigFlags) { +export const startupLog = (logger: Logger, flags: ConfigFlags) => { if (flags.task === 'info' || flags.task === 'serve') { return; } @@ -19,9 +19,9 @@ export function startupLog(logger: Logger, flags: ConfigFlags) { startupMsg += logger.emoji(' ' + vermoji); logger.info(startupMsg); -} +}; -export function loadedCompilerLog(sys: CompilerSystem, logger: Logger, flags: ConfigFlags, coreCompiler: CoreCompiler) { +export const loadedCompilerLog = (sys: CompilerSystem, logger: Logger, flags: ConfigFlags, coreCompiler: CoreCompiler) => { const sysDetails = sys.details; const runtimeInfo = `${sys.name} ${sys.version}`; const platformInfo = `${sysDetails.platform}, ${sysDetails.cpuModel}`; @@ -38,9 +38,9 @@ export function loadedCompilerLog(sys: CompilerSystem, logger: Logger, flags: Co logger.info(platformInfo); logger.info(statsInfo); } -} +}; -export function startupCompilerLog(coreCompiler: CoreCompiler, config: Config) { +export const startupCompilerLog = (coreCompiler: CoreCompiler, config: Config) => { if (config.suppressLogs === true) { return; } @@ -69,4 +69,4 @@ export function startupCompilerLog(coreCompiler: CoreCompiler, config: Config) { logger.warn(`Disabling cache during development will slow down incremental builds.`); } } -} +}; diff --git a/src/cli/parse-flags.ts b/src/cli/parse-flags.ts index 4bad3a4057a..8eab269570b 100644 --- a/src/cli/parse-flags.ts +++ b/src/cli/parse-flags.ts @@ -1,7 +1,7 @@ import type { CompilerSystem, ConfigFlags } from '../declarations'; import { dashToPascalCase } from '@utils'; -export function parseFlags(sys: CompilerSystem, args: string[]): ConfigFlags { +export const parseFlags = (sys: CompilerSystem, args: string[]): ConfigFlags => { const flags: any = { task: null, args: [], @@ -39,9 +39,9 @@ export function parseFlags(sys: CompilerSystem, args: string[]): ConfigFlags { }); return flags; -} +}; -function parseArgs(flags: any, args: string[], knownArgs: string[]) { +const parseArgs = (flags: any, args: string[], knownArgs: string[]) => { ARG_OPTS.boolean.forEach(booleanName => { const alias = (ARG_OPTS.alias as any)[booleanName]; const flagKey = configCase(booleanName); @@ -153,7 +153,7 @@ function parseArgs(flags: any, args: string[], knownArgs: string[]) { } } }); -} +}; const configCase = (prop: string) => { prop = dashToPascalCase(prop); @@ -203,7 +203,7 @@ const ARG_OPTS = { }, }; -function getNpmConfigEnvArgs(sys: CompilerSystem) { +const getNpmConfigEnvArgs = (sys: CompilerSystem) => { // process.env.npm_config_argv // {"remain":["4444"],"cooked":["run","serve","--port","4444"],"original":["run","serve","--port","4444"]} let args: string[] = []; @@ -217,4 +217,4 @@ function getNpmConfigEnvArgs(sys: CompilerSystem) { } } catch (e) {} return args; -} +}; diff --git a/src/cli/task-docs.ts b/src/cli/task-docs.ts index dd0d07e4209..ee1043c8377 100644 --- a/src/cli/task-docs.ts +++ b/src/cli/task-docs.ts @@ -3,7 +3,7 @@ import type { CoreCompiler } from './load-compiler'; import { isOutputTargetDocs } from '../compiler/output-targets/output-utils'; import { startupCompilerLog } from './logs'; -export async function taskDocs(coreCompiler: CoreCompiler, config: Config) { +export const taskDocs = async (coreCompiler: CoreCompiler, config: Config) => { config.devServer = null; config.outputTargets = config.outputTargets.filter(isOutputTargetDocs); config.devMode = true; @@ -14,4 +14,4 @@ export async function taskDocs(coreCompiler: CoreCompiler, config: Config) { await compiler.build(); await compiler.destroy(); -} +}; diff --git a/src/cli/task-generate.ts b/src/cli/task-generate.ts index 697be0f6a6a..258815f237d 100644 --- a/src/cli/task-generate.ts +++ b/src/cli/task-generate.ts @@ -5,7 +5,7 @@ import { IS_NODE_ENV, validateComponentTag } from '@utils'; /** * Task to generate component boilerplate. */ -export async function taskGenerate(coreCompiler: CoreCompiler, config: Config) { +export const taskGenerate = async (coreCompiler: CoreCompiler, config: Config) => { if (!IS_NODE_ENV) { config.logger.error(`"generate" command is currently only implemented for a NodeJS environment`); config.sys.exit(1); @@ -60,7 +60,7 @@ export async function taskGenerate(coreCompiler: CoreCompiler, config: Config) { const absoluteRootDir = config.rootDir; writtenFiles.map(file => console.log(` - ${path.relative(absoluteRootDir, file)}`)); -} +}; /** * Show a checkbox prompt to select the files to be generated. diff --git a/src/cli/task-help.ts b/src/cli/task-help.ts index d677cf89372..b1314c3821a 100644 --- a/src/cli/task-help.ts +++ b/src/cli/task-help.ts @@ -1,6 +1,6 @@ import type { CompilerSystem, Logger } from '../declarations'; -export function taskHelp(sys: CompilerSystem, logger: Logger) { +export const taskHelp = (sys: CompilerSystem, logger: Logger) => { const p = logger.dim(sys.details.platform === 'windows' ? '>' : '$'); console.log(` @@ -34,4 +34,4 @@ export function taskHelp(sys: CompilerSystem, logger: Logger) { ${p} ${logger.green('stencil test --spec --e2e')} `); -} +}; diff --git a/src/cli/task-info.ts b/src/cli/task-info.ts index 3946a5a5f76..5d5a6a19969 100644 --- a/src/cli/task-info.ts +++ b/src/cli/task-info.ts @@ -1,7 +1,7 @@ import type { CompilerSystem, Logger } from '../declarations'; import type { CoreCompiler } from './load-compiler'; -export function taskInfo(coreCompiler: CoreCompiler, sys: CompilerSystem, logger: Logger) { +export const taskInfo = (coreCompiler: CoreCompiler, sys: CompilerSystem, logger: Logger) => { const details = sys.details; const versions = coreCompiler.versions; @@ -16,4 +16,4 @@ export function taskInfo(coreCompiler: CoreCompiler, sys: CompilerSystem, logger console.log(`${logger.cyan(' Rollup:')} ${versions.rollup}`); console.log(`${logger.cyan(' Terser:')} ${versions.terser}`); console.log(``); -} +}; diff --git a/src/cli/task-prerender.ts b/src/cli/task-prerender.ts index 2a53feafba5..6d1d9df6a33 100644 --- a/src/cli/task-prerender.ts +++ b/src/cli/task-prerender.ts @@ -3,7 +3,7 @@ import type { CoreCompiler } from './load-compiler'; import { catchError } from '@utils'; import { startupCompilerLog } from './logs'; -export async function taskPrerender(coreCompiler: CoreCompiler, config: Config) { +export const taskPrerender = async (coreCompiler: CoreCompiler, config: Config) => { startupCompilerLog(coreCompiler, config); const hydrateAppFilePath = config.flags.unknownArgs[0]; @@ -21,15 +21,15 @@ export async function taskPrerender(coreCompiler: CoreCompiler, config: Config) if (diagnostics.some(d => d.level === 'error')) { config.sys.exit(1); } -} +}; -export async function runPrerenderTask( +export const runPrerenderTask = async ( coreCompiler: CoreCompiler, config: Config, hydrateAppFilePath: string, componentGraph: BuildResultsComponentGraph, srcIndexHtmlPath: string, -) { +) => { const diagnostics: Diagnostic[] = []; try { @@ -46,4 +46,4 @@ export async function runPrerenderTask( } return diagnostics; -} +}; diff --git a/src/cli/task-serve.ts b/src/cli/task-serve.ts index 58aff775eb4..7eafe22fda5 100644 --- a/src/cli/task-serve.ts +++ b/src/cli/task-serve.ts @@ -1,7 +1,7 @@ import type { Config } from '../declarations'; import { isString } from '@utils'; -export async function taskServe(config: Config) { +export const taskServe = async (config: Config) => { config.suppressLogs = true; config.flags.serve = true; @@ -25,4 +25,4 @@ export async function taskServe(config: Config) { config.sys.onProcessInterrupt(() => { devServer && devServer.close(); }); -} +}; diff --git a/src/cli/task-test.ts b/src/cli/task-test.ts index a48e2e6dd80..ff6f0a38bad 100644 --- a/src/cli/task-test.ts +++ b/src/cli/task-test.ts @@ -1,7 +1,7 @@ import type { Config, TestingRunOptions } from '../declarations'; import { IS_NODE_ENV } from '@utils'; -export async function taskTest(config: Config) { +export const taskTest = async (config: Config) => { if (!IS_NODE_ENV) { config.logger.error(`"test" command is currently only implemented for a NodeJS environment`); config.sys.exit(1); @@ -54,4 +54,4 @@ export async function taskTest(config: Config) { config.logger.error(e); config.sys.exit(1); } -} +};