Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

accept a readonly array for configuration options #13401

Merged
merged 4 commits into from May 19, 2021
Merged

accept a readonly array for configuration options #13401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60d4605
fix types: accept a readonly array for configuration options
pcorpet Mar 8, 2021
cc1b414
Update lib/webpack.js
pcorpet Apr 1, 2021
ad75cca
Merge branch 'master' into pascal-readonly-array
sokra May 18, 2021
5f7394b
fix type error
sokra May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/webpack.js
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ const getValidateSchema = memoize(() => require("./validateSchema"));
*/

/**
* @param {WebpackOptions[]} childOptions options array
* @param {ReadonlyArray<WebpackOptions>} childOptions options array
* @param {MultiCompilerOptions} options options
* @returns {MultiCompiler} a multi-compiler
*/
Expand Down Expand Up @@ -92,14 +92,14 @@ const createCompiler = rawOptions => {

/**
* @callback WebpackFunctionMulti
* @param {WebpackOptions[] & MultiCompilerOptions} options options objects
* @param {ReadonlyArray<WebpackOptions> & MultiCompilerOptions} options options objects
* @param {Callback<MultiStats>=} callback callback
* @returns {MultiCompiler} the multi compiler object
*/

const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
/**
* @param {WebpackOptions | (WebpackOptions[] & MultiCompilerOptions)} options options
* @param {WebpackOptions | (ReadonlyArray<WebpackOptions> & MultiCompilerOptions)} options options
* @param {Callback<Stats> & Callback<MultiStats>=} callback callback
* @returns {Compiler | MultiCompiler}
*/
Expand All @@ -115,14 +115,18 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
let watchOptions;
if (Array.isArray(options)) {
/** @type {MultiCompiler} */
compiler = createMultiCompiler(options, options);
compiler = createMultiCompiler(
options,
/** @type {MultiCompilerOptions} */ (options)
);
watch = options.some(options => options.watch);
watchOptions = options.map(options => options.watchOptions || {});
} else {
const webpackOptions = /** @type {WebpackOptions} */ (options);
/** @type {Compiler} */
compiler = createCompiler(options);
watch = options.watch;
watchOptions = options.watchOptions || {};
compiler = createCompiler(webpackOptions);
watch = webpackOptions.watch;
watchOptions = webpackOptions.watchOptions || {};
}
return { compiler, watch, watchOptions };
};
Expand Down
4 changes: 2 additions & 2 deletions types.d.ts
View file
Open in desktop
Expand Up @@ -11925,14 +11925,14 @@ declare function exports(
callback?: CallbackWebpack<Stats>
): Compiler;
declare function exports(
options: Configuration[] & MultiCompilerOptions,
options: ReadonlyArray<Configuration> & MultiCompilerOptions,
callback?: CallbackWebpack<MultiStats>
): MultiCompiler;
declare namespace exports {
export const webpack: {
(options: Configuration, callback?: CallbackWebpack<Stats>): Compiler;
(
options: Configuration[] & MultiCompilerOptions,
options: ReadonlyArray<Configuration> & MultiCompilerOptions,
callback?: CallbackWebpack<MultiStats>
): MultiCompiler;
};
Expand Down