Skip to content

fix(#1041): respect output.cssFilename and output.cssChunkFilename #1151

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

Open
SukkaW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(#1041): respect output.cssFilename and output.cssChunkFilename #1151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 34 additions & 25 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const {

/**
* @typedef {object} NormalizedPluginOptions
* @property {Filename} filename filename
* @property {Filename=} filename filename
* @property {ChunkFilename=} chunkFilename chunk filename
* @property {boolean} ignoreOrder true when need to ignore order, otherwise false
* @property {string | ((linkTag: HTMLLinkElement) => void)=} insert a link insert place or a custom insert function
Expand Down Expand Up @@ -568,7 +568,6 @@ class MiniCssExtractPlugin {
* @type {NormalizedPluginOptions}
*/
this.options = {
filename: DEFAULT_FILENAME,
ignoreOrder: false,
// TODO remove in the next major release
experimentalUseImportModule: undefined,
Expand All @@ -591,39 +590,49 @@ class MiniCssExtractPlugin {
: options.linkType,
attributes: options.attributes,
};
}

if (!this.options.chunkFilename) {
const { filename } = this.options;

if (typeof filename !== "function") {
const hasName = /** @type {string} */ (filename).includes("[name]");
const hasId = /** @type {string} */ (filename).includes("[id]");
/**
* @param {Compiler} compiler compiler
*/
apply(compiler) {
// Finally normalize filenames based on compiler options
const normalizedFilename =
this.options.filename ||
compiler.options.output.cssFilename ||
DEFAULT_FILENAME;
let normalizedChunkFilename =
this.options.chunkFilename || compiler.options.output.cssChunkFilename;

if (!normalizedChunkFilename) {
if (typeof normalizedFilename !== "function") {
const hasName = /** @type {string} */ (normalizedFilename).includes(
"[name]",
);
const hasId = /** @type {string} */ (normalizedFilename).includes(
"[id]",
);
const hasChunkHash =
/** @type {string} */
(filename).includes("[chunkhash]");
(normalizedFilename).includes("[chunkhash]");
const hasContentHash =
/** @type {string} */
(filename).includes("[contenthash]");
(normalizedFilename).includes("[contenthash]");

// Anything changing depending on chunk is fine
if (hasChunkHash || hasContentHash || hasName || hasId) {
this.options.chunkFilename = filename;
normalizedChunkFilename = normalizedFilename;
} else {
// Otherwise prefix "[id]." in front of the basename to make it changing
this.options.chunkFilename =
normalizedChunkFilename =
/** @type {string} */
(filename).replace(/(^|\/)([^/]*(?:\?|$))/, "$1[id].$2");
(normalizedFilename).replace(/(^|\/)([^/]*(?:\?|$))/, "$1[id].$2");
}
} else {
this.options.chunkFilename = "[id].css";
normalizedChunkFilename = "[id].css";
}
}
}

/**
* @param {Compiler} compiler compiler
*/
apply(compiler) {
const { webpack } = compiler;

if (
Expand Down Expand Up @@ -743,8 +752,8 @@ class MiniCssExtractPlugin {
/** @type {string} */
(
chunk.canBeInitial()
? this.options.filename
: this.options.chunkFilename
? normalizedFilename
: normalizedChunkFilename
);

if (renderedModules.length > 0) {
Expand Down Expand Up @@ -1215,8 +1224,8 @@ class MiniCssExtractPlugin {
enabledChunks.add(chunk);

if (
typeof this.options.chunkFilename === "string" &&
/\[(full)?hash(:\d+)?\]/.test(this.options.chunkFilename)
typeof normalizedChunkFilename === "string" &&
/\[(full)?hash(:\d+)?\]/.test(normalizedChunkFilename)
) {
set.add(RuntimeGlobals.getFullHash);
}
Expand All @@ -1239,8 +1248,8 @@ class MiniCssExtractPlugin {
}

return referencedChunk.canBeInitial()
? /** @type {Filename} */ (this.options.filename)
: /** @type {ChunkFilename} */ (this.options.chunkFilename);
? /** @type {Filename} */ (normalizedFilename)
: /** @type {ChunkFilename} */ (normalizedChunkFilename);
},
set.has(RuntimeGlobals.hmrDownloadUpdateHandlers),
),
Expand Down
Loading