Skip to content

Commit 9f55ee9

Browse files
author
Michael Vurchio
committed
Merge branch 'release/1.0.0' into develop
2 parents 8d5a5f3 + 76db978 commit 9f55ee9

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Svelte preprocess CSS Modules, changelog
22

33
# 1.0.0
4-
- Ability to use the same class multiple time
4+
- Ability to use the same class on multiple elments
55
- Use with svelte loader Ok
6+
- Add test
67

78
# 0.1.1
89
- Fix modules exports

index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ const pluginOptions = {
88

99
const regex = {
1010
module: /\$style\.(:?[\w\d-]*)/gm,
11-
style: /<style(\s[^]*?)?>([^]*?)<\/style>/gi
11+
style: /<style(\s[^]*?)?>([^]*?)<\/style>/gi,
12+
class: (className) => {
13+
return new RegExp(`\\.(${className})\\b(?![-_])`, 'gm')
14+
}
1215
};
1316

1417
let moduleClasses = {};
@@ -58,9 +61,7 @@ const markup = async ({ content, filename }) => {
5861
return { code: content.replace(regex.module, (match, className) => {
5962
let replacement = '';
6063
if (styles.length) {
61-
const classRegex = new RegExp(`\\.(${className})\\b(?![-_])`, 'gm');
62-
63-
if (classRegex.test(styles[0])) {
64+
if (regex.class(className).test(styles[0])) {
6465
const interpolatedName = generateName(
6566
filename,
6667
styles[0],
@@ -83,9 +84,8 @@ const style = async ({ content, filename }) => {
8384
}
8485

8586
for (const className in classes) {
86-
const classRegex = new RegExp(`\\.(${className})\\b(?![-_])`, 'gm');
8787
code = code.replace(
88-
classRegex,
88+
regex.class(className),
8989
() => `:global(.${classes[className]})`
9090
);
9191
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "svelte-preprocess-cssmodules",
3-
"version": "0.1.1",
3+
"version": "1.0.0",
44
"description": "Svelte preprocessor to generate CSS Modules classname on Svelte components",
55
"keywords": [
66
"svelte",

0 commit comments

Comments
 (0)