fix multiple colors in one declaration case

fpetrakov · Nov 26, 2022 · 698c791 · 698c791
1 parent 70283a3
commit 698c791
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "convert-to-oklch",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"description": "CLI tool that converts rgb(), rgba(), hex, hsl() and hsla() colors to oklch() in specified CSS files.",
 	"main": "./src/index.js",
 	"bin": {

diff --git a/src/plugin.js b/src/plugin.js
@@ -1,5 +1,5 @@
 const Color = require("colorjs.io").default;
-const colorsRegex = new RegExp(/(^#[0-9a-f]{3,8}$|(hsla?|rgba?)\([^)]+\))/gi);
+const colorsRegex = new RegExp(/(#[0-9a-f]{3,8}|(hsla?|rgba?)\([^)]+\))/gi);
 const pc = require("picocolors");
 
 module.exports = () => ({
@@ -11,6 +11,7 @@ module.exports = () => ({
 		const colorsToConvert = originalColors.filter(
 			(originalColor) => !originalColor.includes("var(--"),
 		);
+		if (!colorsToConvert.length) return;
 
 		const convertedAndOriginalColors = colorsToConvert.map(
 			(originalColor) => {
@@ -26,10 +27,11 @@ module.exports = () => ({
 				}
 			},
 		);
+		if (!convertedAndOriginalColors.length) return;
 
 		convertedAndOriginalColors.forEach(({ converted, original }) => {
 			try {
-				decl.value = decl.value.replace(original, converted);
+				decl.value = decl.value.replaceAll(original, converted);
 			} catch (e) {
 				console.error(
 					pc.bgRed(