Skip to content

make some improvements to CSS modules #183

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

make some improvements to CSS modules #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68c0b55
remove .module from `[name]` placeholder
Luke-zhang-04 Jul 8, 2021
2f9632d
feat: add `modules.include` option
Luke-zhang-04 Jul 8, 2021
5c763c0
fix: change ensureAutoModules default to true
Luke-zhang-04 Jul 8, 2021
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
12 changes: 9 additions & 3 deletions src/loaders/postcss/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ function getClassNameDefault(name: string): string {
return id;
}

function ensureAutoModules(am: PostCSSLoaderOptions["autoModules"], id: string): boolean {
function ensureAutoModules(
am: PostCSSLoaderOptions["autoModules"] | undefined,
id: string,
): boolean {
if (am === undefined) return true;
if (typeof am === "function") return am(id);
if (am instanceof RegExp) return am.test(id);
return am && /\.module\.[A-Za-z]+$/.test(id);
Expand All @@ -46,7 +50,9 @@ const loader: Loader<PostCSSLoaderOptions> = {
const config = await loadConfig(this.id, options.config);
const plugins: AcceptedPlugin[] = [];
const autoModules = ensureAutoModules(options.autoModules, this.id);
const supportModules = Boolean(options.modules || autoModules);
const supportModules = Boolean(
(options.modules && ensureAutoModules(options.modules.include, this.id)) || autoModules,
);
const modulesExports: Record<string, string> = {};

const postcssOpts: PostCSSOptions = {
Expand Down Expand Up @@ -114,7 +120,7 @@ const loader: Loader<PostCSSLoaderOptions> = {
break;
}

map = mm((res.map?.toJSON() as unknown) as RawSourceMap)
map = mm(res.map?.toJSON() as unknown as RawSourceMap)
.resolve(path.dirname(postcssOpts.to))
.toString();

Expand Down
2 changes: 1 addition & 1 deletion src/loaders/postcss/modules/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default (placeholder = "[name]_[local]__[hash:8]") => (
return makeLegalIdentifier(
placeholder
.replace("[dir]", path.basename(dir))
.replace("[name]", name)
.replace("[name]", name.replace(/\.module$/, ""))
.replace("[local]", local)
.replace(hashRe, hashLen ? hash.slice(0, hashLen) : hash),
);
Expand Down
8 changes: 8 additions & 0 deletions src/loaders/postcss/modules/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ export interface ModulesOptions {
* @default "[name]_[local]__[hash:8]"
*/
generateScopedName?: string | ((name: string, file: string, css: string) => string);
/**
* Files to include for [CSS Modules](https://github.com/css-modules/css-modules)
* for files named `[name].module.[ext]`
* (e.g. `foo.module.css`, `bar.module.stylus`),
* or pass your own function or regular expression
* @default false
*/
include?: import("../../../types").Options["autoModules"];
}

export default (options: ModulesOptions): (Plugin | Processor)[] => {
Expand Down