Skip to content

Commit 4a909db

Browse files
fix: import order
1 parent 58637ca commit 4a909db

File tree

5 files changed

+44
-1
lines changed

5 files changed

+44
-1
lines changed

src/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@ class MiniCssExtractPlugin {
989989
let content = module.content.toString();
990990

991991
const readableIdentifier = module.readableIdentifier(requestShortener);
992+
const startsWithAtRuleImport = /^@import url/.test(content);
992993

993994
if (compilation.outputOptions.pathinfo) {
994995
// From https://github.com/webpack/webpack/blob/29eff8a74ecc2f87517b627dee451c2af9ed3f3f/lib/ModuleInfoHeaderPlugin.js#L191-L194
@@ -999,7 +1000,7 @@ class MiniCssExtractPlugin {
9991000
content = headerStr + content;
10001001
}
10011002

1002-
if (/^@import url/.test(content)) {
1003+
if (startsWithAtRuleImport) {
10031004
// HACK for IE
10041005
// http://stackoverflow.com/a/14676665/1458162
10051006
if (module.media) {

test/cases/at-import-in-entry/a.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body {
2+
font-family: "Manrope";
3+
}

test/cases/at-import-in-entry/b.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import url(https://fonts.googleapis.com/css2?family=Manrope:wght@500;800&display=swap);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*!****************************************************************!*\
2+
!*** css ../../../node_modules/css-loader/dist/cjs.js!./b.css ***!
3+
\****************************************************************/
4+
@import url(https://fonts.googleapis.com/css2?family=Manrope:wght@500;800&display=swap);
5+
/*!****************************************************************!*\
6+
!*** css ../../../node_modules/css-loader/dist/cjs.js!./a.css ***!
7+
\****************************************************************/
8+
body {
9+
font-family: 'Manrope';
10+
}
11+
12+
/*!********************************************************************!*\
13+
!*** css ../../../node_modules/css-loader/dist/cjs.js!./b.css (1) ***!
14+
\********************************************************************/
15+
16+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import Self from "../../../src";
2+
3+
module.exports = {
4+
mode: "development",
5+
entry: ["./a.css", "./b.css"],
6+
output: {
7+
pathinfo: true,
8+
},
9+
module: {
10+
rules: [
11+
{
12+
test: /\.css$/,
13+
use: [Self.loader, "css-loader"],
14+
},
15+
],
16+
},
17+
plugins: [
18+
new Self({
19+
filename: "[name].css",
20+
}),
21+
],
22+
};

0 commit comments

Comments
 (0)