Skip to content

Commit

Permalink
fix remaining with assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
dnalborczyk committed Nov 6, 2021
1 parent f4af4ca commit e512052
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/utils/options/mergeOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const getExternal = (
return typeof configExternal === 'function'
? (source: string, importer: string | undefined, isResolved: boolean) =>
configExternal(source, importer, isResolved) || overrides.external.indexOf(source) !== -1
: ensureArray(configExternal).concat(overrides.external);
: (ensureArray(configExternal).concat(overrides.external) as ExternalOption);
};

const getOnWarn = (
Expand Down
6 changes: 4 additions & 2 deletions src/utils/options/normalizeInputOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
InputOptions,
ModuleSideEffectsOption,
NormalizedInputOptions,
Plugin,
PreserveEntrySignaturesOption,
PureModulesOption,
RollupBuild,
Expand Down Expand Up @@ -53,7 +54,7 @@ export function normalizeInputOptions(config: InputOptions): {
moduleContext: getModuleContext(config, context),
onwarn,
perf: config.perf || false,
plugins: ensureArray(config.plugins),
plugins: ensureArray(config.plugins) as Plugin[],
preserveEntrySignatures: getPreserveEntrySignatures(config, unsetOptions),
preserveModules: getPreserveModules(config, onwarn, strictDeprecations),
preserveSymlinks: config.preserveSymlinks || false,
Expand Down Expand Up @@ -101,7 +102,8 @@ const getAcorn = (config: InputOptions): acorn.Options => ({

const getAcornInjectPlugins = (
config: InputOptions
): NormalizedInputOptions['acornInjectPlugins'] => ensureArray(config.acornInjectPlugins);
): NormalizedInputOptions['acornInjectPlugins'] =>
ensureArray(config.acornInjectPlugins) as (() => unknown)[];

const getCache = (config: InputOptions): NormalizedInputOptions['cache'] =>
(config.cache as unknown as RollupBuild)?.cache || config.cache;
Expand Down
3 changes: 2 additions & 1 deletion src/utils/options/normalizeOutputOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
NormalizedInputOptions,
NormalizedOutputOptions,
OutputOptions,
Plugin,
SourcemapPathTransformOption
} from '../../rollup/types';
import { ensureArray } from '../ensureArray';
Expand Down Expand Up @@ -64,7 +65,7 @@ export function normalizeOutputOptions(
noConflict: config.noConflict || false,
outro: getAddon(config, 'outro'),
paths: config.paths || {},
plugins: ensureArray(config.plugins),
plugins: ensureArray(config.plugins) as Plugin[],
preferConst,
preserveModules,
preserveModulesRoot: getPreserveModulesRoot(config),
Expand Down

0 comments on commit e512052

Please sign in to comment.