mirror of
https://github.com/chinchang/web-maker.git
synced 2025-07-27 00:30:09 +02:00
fix acss config with unquoted keys
This commit is contained in:
@@ -54,7 +54,7 @@ export function computeCss(userCode, mode, settings) {
|
|||||||
{
|
{
|
||||||
indentedSyntax: mode === CssModes.SASS
|
indentedSyntax: mode === CssModes.SASS
|
||||||
},
|
},
|
||||||
function(result) {
|
function (result) {
|
||||||
// Something was wrong
|
// Something was wrong
|
||||||
if (result.line && result.message) {
|
if (result.line && result.message) {
|
||||||
errors = {
|
errors = {
|
||||||
@@ -80,12 +80,12 @@ export function computeCss(userCode, mode, settings) {
|
|||||||
}
|
}
|
||||||
} else if (mode === CssModes.LESS) {
|
} else if (mode === CssModes.LESS) {
|
||||||
less.render(code).then(
|
less.render(code).then(
|
||||||
function(result) {
|
function (result) {
|
||||||
d.resolve({
|
d.resolve({
|
||||||
code: result.css
|
code: result.css
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
function(error) {
|
function (error) {
|
||||||
errors = {
|
errors = {
|
||||||
lang: 'css',
|
lang: 'css',
|
||||||
data: [
|
data: [
|
||||||
@@ -102,7 +102,7 @@ export function computeCss(userCode, mode, settings) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
} else if (mode === CssModes.STYLUS) {
|
} else if (mode === CssModes.STYLUS) {
|
||||||
stylus(code).render(function(error, result) {
|
stylus(code).render(function (error, result) {
|
||||||
if (error) {
|
if (error) {
|
||||||
window.err = error;
|
window.err = error;
|
||||||
// Last line of message is the actual message
|
// Last line of message is the actual message
|
||||||
@@ -132,10 +132,18 @@ export function computeCss(userCode, mode, settings) {
|
|||||||
const html = code;
|
const html = code;
|
||||||
const foundClasses = atomizer.findClassNames(html);
|
const foundClasses = atomizer.findClassNames(html);
|
||||||
var finalConfig;
|
var finalConfig;
|
||||||
|
|
||||||
|
// Regular expression to find unquoted keys: looks for word characters (including _) followed by a colon
|
||||||
|
// and put them in quotes
|
||||||
|
const fixedConfigJson = (settings.acssConfig || '{}').replace(
|
||||||
|
/([{,]\s*)([^\s"{:]+)(\s*:\s*)/g,
|
||||||
|
'$1"$2"$3'
|
||||||
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
finalConfig = atomizer.getConfig(
|
finalConfig = atomizer.getConfig(
|
||||||
foundClasses,
|
foundClasses,
|
||||||
JSON.parse(settings.acssConfig)
|
JSON.parse(fixedConfigJson)
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
finalConfig = atomizer.getConfig(foundClasses, {});
|
finalConfig = atomizer.getConfig(foundClasses, {});
|
||||||
|
Reference in New Issue
Block a user