diff --git a/src/loaders/color-loader.js b/src/loaders/color-loader.js index 0810168..6c975ea 100644 --- a/src/loaders/color-loader.js +++ b/src/loaders/color-loader.js @@ -1,13 +1,18 @@ -const REGEX = /(?.*?):.*?#(?.*?)/gm; +const TRIM_REGEX = /colors: \((?.*?)\);/s; +const COLOR_REGEX = /(?[\w-]*?):.*?#(?.*?),?$/gm; module.exports = function (content, map, meta) { - const matches = [...content.matchAll(REGEX)]; - const outLines = ["[base]"]; - + const colors = content + .match(TRIM_REGEX) + .groups.colors.split("\n") + .map((l) => l.trim()) + .join("\n"); + const matches = [...colors.matchAll(COLOR_REGEX)]; + const ini = ["[base]"]; for (let i = 0; i < matches.length; i++) { const { key, color } = matches[i].groups; - outLines.push(`${key} = ${color}`); + ini.push(`${key} = ${color}`); } - return outLines.join("\n"); + return ini.join("\n"); };