mirror of https://github.com/webpack/webpack.git
fix: prefer relative
This commit is contained in:
parent
57318df065
commit
805b9b61d4
|
@ -1435,12 +1435,14 @@ const getResolveDefaults = ({ cache, context, targetProperties, mode }) => {
|
||||||
extensions: [...jsExtensions]
|
extensions: [...jsExtensions]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const cssExtensions = [".css"];
|
||||||
|
|
||||||
/** @type {function(): ResolveOptions} */
|
/** @type {function(): ResolveOptions} */
|
||||||
const styleDeps = () => ({
|
const styleDeps = () => ({
|
||||||
mainFields: ["style", "..."],
|
mainFields: ["style", "..."],
|
||||||
mainFiles: [],
|
mainFiles: [],
|
||||||
conditionNames: ["style"],
|
conditionNames: ["style"],
|
||||||
extensions: [".css"]
|
extensions: [...cssExtensions]
|
||||||
});
|
});
|
||||||
|
|
||||||
/** @type {ResolveOptions} */
|
/** @type {ResolveOptions} */
|
||||||
|
@ -1473,7 +1475,10 @@ const getResolveDefaults = ({ cache, context, targetProperties, mode }) => {
|
||||||
unknown: cjsDeps(),
|
unknown: cjsDeps(),
|
||||||
// for backward-compat: getResolve without dependencyType
|
// for backward-compat: getResolve without dependencyType
|
||||||
undefined: cjsDeps(),
|
undefined: cjsDeps(),
|
||||||
"css-import": styleDeps()
|
"css-import": {
|
||||||
|
...styleDeps(),
|
||||||
|
preferRelative: true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
4
test/configCases/css/css-import/node_modules/prefer-relative.css/package.json
generated
vendored
Normal file
4
test/configCases/css/css-import/node_modules/prefer-relative.css/package.json
generated
vendored
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"name": "prefer-relative.css",
|
||||||
|
"style": "./styles.css"
|
||||||
|
}
|
3
test/configCases/css/css-import/node_modules/prefer-relative.css/styles.css
generated
vendored
Normal file
3
test/configCases/css/css-import/node_modules/prefer-relative.css/styles.css
generated
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
.should-be-not-imported {
|
||||||
|
color: steelblue;
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
.relative {
|
||||||
|
color: red;
|
||||||
|
}
|
|
@ -7,3 +7,4 @@
|
||||||
@import "./directory";
|
@import "./directory";
|
||||||
@import "./extensions-imported.mycss";
|
@import "./extensions-imported.mycss";
|
||||||
@import "./with-less-import.css";
|
@import "./with-less-import.css";
|
||||||
|
@import "prefer-relative.css";
|
||||||
|
|
Loading…
Reference in New Issue