From e8ec5bfaa02b14f542c6050f175e1e5af60d34aa Mon Sep 17 00:00:00 2001 From: liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com> Date: Wed, 1 Jun 2022 01:36:45 +0800 Subject: [PATCH] review --- packages/babel-core/src/config/caching.ts | 5 +++-- packages/babel-core/src/config/config-chain.ts | 2 +- packages/babel-core/src/config/files/index-browser.ts | 2 +- packages/babel-core/src/config/files/module-types.ts | 2 +- packages/babel-core/src/config/full.ts | 11 +++++++---- packages/babel-core/src/config/helpers/config-api.ts | 5 +++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/babel-core/src/config/caching.ts b/packages/babel-core/src/config/caching.ts index 2a6017294dbe..5575ff78b231 100644 --- a/packages/babel-core/src/config/caching.ts +++ b/packages/babel-core/src/config/caching.ts @@ -359,8 +359,9 @@ function makeSimpleConfigurator( } cacheFn.forever = () => cache.forever(); cacheFn.never = () => cache.never(); - cacheFn.using = (cb: Function) => cache.using(() => assertSimpleType(cb())); - cacheFn.invalidate = (cb: Function) => + cacheFn.using = (cb: { (): SimpleType }) => + cache.using(() => assertSimpleType(cb())); + cacheFn.invalidate = (cb: { (): SimpleType }) => cache.invalidate(() => assertSimpleType(cb())); return cacheFn as any; diff --git a/packages/babel-core/src/config/config-chain.ts b/packages/babel-core/src/config/config-chain.ts index d96893777a87..43e9242ac30b 100644 --- a/packages/babel-core/src/config/config-chain.ts +++ b/packages/babel-core/src/config/config-chain.ts @@ -465,7 +465,7 @@ function buildProgrammaticLogger( return () => {}; } return baseLogger.configure(context.showConfig, ChainFormatter.Programmatic, { - // @ts-expect-error + // @ts-expect-error caller maybe void callerName: context.caller?.name, }); } diff --git a/packages/babel-core/src/config/files/index-browser.ts b/packages/babel-core/src/config/files/index-browser.ts index 26054f5df574..7650947c444c 100644 --- a/packages/babel-core/src/config/files/index-browser.ts +++ b/packages/babel-core/src/config/files/index-browser.ts @@ -72,7 +72,7 @@ export function* resolveShowConfigPath( return null; } -export const ROOT_CONFIG_FILENAMES: any[] = []; +export const ROOT_CONFIG_FILENAMES: string[] = []; // eslint-disable-next-line @typescript-eslint/no-unused-vars export function resolvePlugin(name: string, dirname: string): string | null { diff --git a/packages/babel-core/src/config/files/module-types.ts b/packages/babel-core/src/config/files/module-types.ts index 57a76a5e77cb..7857230e0a86 100644 --- a/packages/babel-core/src/config/files/module-types.ts +++ b/packages/babel-core/src/config/files/module-types.ts @@ -6,7 +6,7 @@ import { createRequire } from "module"; const require = createRequire(import.meta.url); -let import_: any; +let import_: ((specifier: string | URL) => any) | undefined; try { // Node < 13.3 doesn't support import() syntax. import_ = require("./import").default; diff --git a/packages/babel-core/src/config/full.ts b/packages/babel-core/src/config/full.ts index f2f8755e08e4..1f83f9cae170 100644 --- a/packages/babel-core/src/config/full.ts +++ b/packages/babel-core/src/config/full.ts @@ -223,7 +223,7 @@ export default gensync<(inputOpts: unknown) => ResolvedConfig | null>( }, ); -function enhanceError(context: any, fn: T): T { +function enhanceError(context: ConfigContext, fn: T): T { return function* (arg1: unknown, arg2: unknown) { try { return yield* fn(arg1, arg2); @@ -392,8 +392,8 @@ const instantiatePlugin = makeWeakCache(function* ( return cache.invalidate(data => run(inheritsDescriptor, data)); }); - plugin.pre = chain(inherits.pre, plugin.pre); - plugin.post = chain(inherits.post, plugin.post); + plugin.pre = chain(inherits.pre as (...args: any[]) => void, plugin.pre); + plugin.post = chain(inherits.post as (...args: any[]) => void, plugin.post); plugin.manipulateOptions = chain( inherits.manipulateOptions, plugin.manipulateOptions, @@ -490,7 +490,10 @@ const instantiatePreset = makeWeakCacheSync( }, ); -function chain(a: any, b: any) { +function chain( + a: undefined | ((...args: Args) => void), + b: undefined | ((...args: Args) => void), +) { const fns = [a, b].filter(Boolean); if (fns.length <= 1) return fns[0]; diff --git a/packages/babel-core/src/config/helpers/config-api.ts b/packages/babel-core/src/config/helpers/config-api.ts index 91c3b10bc9cf..32a211d1c0db 100644 --- a/packages/babel-core/src/config/helpers/config-api.ts +++ b/packages/babel-core/src/config/helpers/config-api.ts @@ -63,8 +63,9 @@ export function makeConfigAPI( }); }); - const caller = (cb: Function) => - cache.using(data => assertSimpleType(cb(data.caller))); + const caller = (cb: { + (CallerMetadata: void | CallerMetadata): SimpleType; + }) => cache.using(data => assertSimpleType(cb(data.caller))); return { version: coreVersion,