Skip to content
This repository was archived by the owner on Jul 19, 2021. It is now read-only.

Grab the entire cssvar value when running the slate-cssvar-loader #397

Merged
merged 1 commit into from
Feb 21, 2018
Merged

Grab the entire cssvar value when running the slate-cssvar-loader #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/slate-cssvar-loader/__tests__/fixtures/css-variables.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
--color_button_text: {{ settings.color_button_text }};
--color_main_bg: {{ settings.color_main_bg }};
--header_family: {{ header_family }};
--letter_spacing: {{ settings.letter_spacing }}px;
}
</style>
2 changes: 1 addition & 1 deletion packages/slate-cssvar-loader/__tests__/fixtures/expected-disabled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ exports = module.exports = require("../../node_modules/css-loader/lib/css-base.j


// module
exports.push([module.id, ".heading {\n color: var(--headings_color);\n background-color: '#FF00FF';\n}\n\n.title {\n color: var(--headings_color);\n}\n\nbody {\n background-color: var(--body_color);\n}", ""]);
exports.push([module.id, ".heading {\n color: var(--headings_color);\n background-color: '#FF00FF';\n letter-spacing: var(--letter_spacing);\n}\n\n.title {\n color: var(--headings_color);\n}\n\nbody {\n background-color: var(--body_color);\n}", ""]);

// exports
2 changes: 1 addition & 1 deletion packages/slate-cssvar-loader/__tests__/fixtures/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ exports = module.exports = require("../../node_modules/css-loader/lib/css-base.j


// module
exports.push([module.id, ".heading {\n color: {{ settings.headings_color }};\n background-color: '#FF00FF';\n}\n\n.title {\n color: {{ settings.headings_color }};\n}\n\nbody {\n background-color: {{ settings.body_color }};\n}", ""]);
exports.push([module.id, ".heading {\n color: {{ settings.headings_color }};\n background-color: '#FF00FF';\n letter-spacing: {{ settings.letter_spacing }}px;\n}\n\n.title {\n color: {{ settings.headings_color }};\n}\n\nbody {\n background-color: {{ settings.body_color }};\n}", ""]);

// exports
1 change: 1 addition & 0 deletions packages/slate-cssvar-loader/__tests__/fixtures/test.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.heading {
color: var(--headings_color);
background-color: '#FF00FF';
letter-spacing: var(--letter_spacing);
}

.title {
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-cssvar-loader/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const config = require('./slate-cssvar-loader.config');

const STYLE_BLOCK_REGEX = /(?:<style>|\{% style %\})([\S\s]*?)(?:<\/style>|\{% endstyle %\})/g;
const CSS_VAR_FUNC_REGEX = /var\(--(.*?)\)/g;
const CSS_VAR_DECL_REGEX = /--(.*?):\s+(\{\{\s*.*?\s*\}\}).*?;/g;
const CSS_VAR_DECL_REGEX = /--(.*?):\s*(\{\{\s*.*?\s*\}\}.*?);/g;

class SlateException {
constructor(message) {
Expand Down