Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions packages/webpack-cli/src/webpack-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,21 @@ class WebpackCLI {
process.exit(0);
}

async #renderVersion(options: { output?: string } = {}): Promise<string> {
let info = await this.#getInfoOutput({
...options,
information: {
npmPackages: `{${DEFAULT_WEBPACK_PACKAGES.map((item) => `*${item}*`).join(",")}}`,
},
});

if (typeof options.output === "undefined") {
info = info.replace("Packages:", "").replaceAll(/^\s+/gm, "").trim();
}

return info;
}

async #getInfoOutput(options: {
output?: string;
additionalPackage?: string[];
Expand Down Expand Up @@ -1781,16 +1796,7 @@ class WebpackCLI {
},
],
action: async (options: { output?: string }) => {
let info = await this.#getInfoOutput({
...options,
information: {
npmPackages: `{${DEFAULT_WEBPACK_PACKAGES.map((item) => `*${item}*`).join(",")}}`,
},
});

if (typeof options.output === "undefined") {
info = info.replace("Packages:", "").replaceAll(/^\s+/gm, "").trim();
}
const info = await this.#renderVersion(options);

this.logger.raw(info);
},
Expand Down Expand Up @@ -2115,16 +2121,8 @@ class WebpackCLI {
const isVersionOption = typeof options.version !== "undefined";

if (isVersionOption) {
const info = (
await this.#getInfoOutput({
information: {
npmPackages: `{${DEFAULT_WEBPACK_PACKAGES.map((item) => `*${item}*`).join(",")}}`,
},
})
)
.replace("Packages:", "")
.replaceAll(/^\s+/gm, "")
.trim();
const info = await this.#renderVersion();

this.logger.raw(info);
process.exit(0);
}
Expand Down