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

feat: 'css/auto' as a css module type #16577

Merged
merged 6 commits into from Jun 14, 2023
+102 −4
Merged

feat: 'css/auto' as a css module type #16577

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4b3185
feat: css/auto
ahabhgk Dec 16, 2022
4d41b50
fix test
ahabhgk Jun 10, 2023
d12ec50
correct comment
ahabhgk Jun 10, 2023
efeb6ed
fix path
ahabhgk Jun 11, 2023
698a284
test for matchResource
ahabhgk Jun 11, 2023
9e02a70
test: more
alexander-akait Jun 12, 2023
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
5 changes: 4 additions & 1 deletion lib/css/CssParser.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ const CssLocalIdentifierDependency = require("../dependencies/CssLocalIdentifier
const CssSelfLocalIdentifierDependency = require("../dependencies/CssSelfLocalIdentifierDependency");
const CssUrlDependency = require("../dependencies/CssUrlDependency");
const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
const { parseResource } = require("../util/identifier");
const walkCssTokens = require("./walkCssTokens");

/** @typedef {import("../Parser").ParserState} ParserState */
Expand Down Expand Up @@ -173,7 +174,9 @@ class CssParser extends Parser {
const module = state.module;
if (
module.type === CSS_MODULE_TYPE_AUTO &&
IS_MODULES.test(module.resourceResolveData.path)
IS_MODULES.test(
parseResource(module.matchResource || module.resource).path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not parser.state.module.resource?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just added to the test about the matchResource part, only use module.resource won't correctly handle the matchResource feature

)
) {
this.defaultMode = "local";
}
Expand Down