fix: same postfix rules (#68)

axyz · web-flow · commit c5c5a9e89571 · 2022-03-17T11:32:32.000+01:00
diff --git a/integration-test/packages/atoms/all/atom.css.snap b/integration-test/packages/atoms/all/atom.css.snap
@@ -70,6 +70,13 @@
 .sMmOaU .R2GDg- {
     color: green;
   }
+.EV62sS {
+	color: blue;
+}
+
+.JYUOso {
+	color: blue;
+}
 /* custom static css (e.g. normalize) can be added here */.YcXvtG {
     color: #1a1a1a
 }
diff --git a/integration-test/packages/atoms/all/atom.min.css.snap b/integration-test/packages/atoms/all/atom.min.css.snap
diff --git a/integration-test/packages/atoms/same-content/.npmignore b/integration-test/packages/atoms/same-content/.npmignore
@@ -0,0 +1,3 @@
+**/*.tsx
+**/*.ts
+!**/*.d.ts
diff --git a/integration-test/packages/atoms/same-content/index.css b/integration-test/packages/atoms/same-content/index.css
@@ -0,0 +1,7 @@
+.bar {
+	color: blue;
+}
+
+.foo_bar {
+	color: blue;
+}
diff --git a/integration-test/packages/atoms/same-content/index.d.ts.snap b/integration-test/packages/atoms/same-content/index.d.ts.snap
@@ -0,0 +1,3 @@
+declare const bar: string;
+declare const foo_bar: string
+export { bar, foo_bar }
diff --git a/integration-test/packages/atoms/same-content/index.esm.js.snap b/integration-test/packages/atoms/same-content/index.esm.js.snap
@@ -0,0 +1,2 @@
+export var bar = "EV62sS";
+export var foo_bar = "JYUOso"
diff --git a/integration-test/packages/atoms/same-content/index.js.snap b/integration-test/packages/atoms/same-content/index.js.snap
@@ -0,0 +1,4 @@
+module.exports = {
+  bar: "EV62sS",
+  foo_bar: "JYUOso"
+};
diff --git a/integration-test/packages/atoms/same-content/module.css.json.snap b/integration-test/packages/atoms/same-content/module.css.json.snap
@@ -0,0 +1 @@
+{"bar":"EV62sS","foo_bar":"JYUOso"}
diff --git a/integration-test/packages/atoms/same-content/module.css.snap b/integration-test/packages/atoms/same-content/module.css.snap
@@ -0,0 +1,7 @@
+.bar {
+	color: blue;
+}
+
+.foo_bar {
+	color: blue;
+}
diff --git a/integration-test/packages/atoms/same-content/package.json b/integration-test/packages/atoms/same-content/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@my-org/same-content",
+  "version": "0.0.1",
+  "main": "index.js",
+  "module": "index.esm.js",
+  "sideEffects": false
+}
diff --git a/integration-test/packages/atoms/same-content/result.css.snap b/integration-test/packages/atoms/same-content/result.css.snap
@@ -0,0 +1,7 @@
+.EV62sS {
+	color: blue;
+}
+
+.JYUOso {
+	color: blue;
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utilitycss/atomic",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "author": "Andrea Moretti (@axyz) <axyzxp@gmail.com>",
   "description": "Atomic CSS composition for yarn workspaces",
   "repository": "utilitycss/atomic",
diff --git a/src/postcss/atomic-css-modules/generateScopedName.ts b/src/postcss/atomic-css-modules/generateScopedName.ts
@@ -20,7 +20,7 @@ const generateScopedName: generateScopedName = ({
     let pkgName = "";
     const definitionsMap = new Map();
     const isElectron = importedElectronRE.test(filename);
-    root.walkRules(new RegExp(`(\.${name}|:import)`), (rule): any => {
+    root.walkRules(new RegExp(`(\\.${name}|:import)`), (rule): any => {
       if (isElectron) {
         // ensure that a rule that appear multiple times has the same hash
         // e.g. inside media queries or when ICSS imported in a different atom.
diff --git a/templates/package.json.hbs b/templates/package.json.hbs
@@ -7,7 +7,7 @@
     "start": "atomic start"
   },
   "devDependencies": {
-    "@utilitycss/atomic": "^0.19.0",
+    "@utilitycss/atomic": "^0.20.0",
     "lerna": "3.13.3"
   },
   "workspaces": {

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,13 @@`
`70`	`70`	`.sMmOaU .R2GDg- {`
`71`	`71`	`color: green;`
`72`	`72`	`}`
	`73`	`+.EV62sS {`
	`74`	`+ color: blue;`
	`75`	`+}`
	`76`	`+`
	`77`	`+.JYUOso {`
	`78`	`+ color: blue;`
	`79`	`+}`
`73`	`80`	`/* custom static css (e.g. normalize) can be added here */.YcXvtG {`
`74`	`81`	`color: #1a1a1a`
`75`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*/.tsx`
	`2`	`+*/.ts`
	`3`	`+!*/.d.ts`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+declare const bar: string;`
	`2`	`+declare const foo_bar: string`
	`3`	`+export { bar, foo_bar }`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export var bar = "EV62sS";`
	`2`	`+export var foo_bar = "JYUOso"`