Rewrite prefix logic and update tests

pull/4740/head
§Domenik Reitzner 6 years ago
parent 4d4858b7c9
commit 6d46efe3dd

@ -298,7 +298,7 @@ export default class Stylesheet {
this.dev = dev;
if (ast.css && ast.css.children.length) {
this.id = `${prefix}${hash(ast.css.content.styles)}`;
this.id = `${prefix}-${hash(ast.css.content.styles)}`;
this.has_styles = true;

@ -1,5 +1,5 @@
export default function get_prefix(str?: string): string {
const standard_prefix = 'svelte-';
const standard_prefix = 'svelte';
if (!str
|| typeof str !== 'string') return standard_prefix;
str = str.replace(/^[^_\-a-z]+|[^_\-a-z0-9]/gi, '');

@ -84,7 +84,13 @@ describe('css', () => {
css: read(`${__dirname}/samples/${dir}/expected.css`)
};
const actual_css = dom.css.code.replace(/svelte(-ref)?-[a-z0-9]+/g, (m, $1) => $1 ? m : 'svelte-xyz');
const replacement = ((config.compileOptions || {}).prefix)
? '-xyz{'
: 'svelte-xyz';
const regex = ((config.compileOptions || {}).prefix)
? /(-ref)?-[a-z0-9]+\{/g
: /svelte(-ref)?-[a-z0-9]+/g;
const actual_css = dom.css.code.replace(regex, (m, $1) => $1 ? m : replacement);
try {
assert.equal(actual_css, expected.css);
} catch (error) {

@ -1,5 +1,5 @@
export default {
compileOptions: {
prefix: 'me$-'
prefix: 'me$'
}
};

@ -1 +1 @@
div.me-1tjtw78{color:blue}
div.me-xyz{color:blue}

@ -1,5 +1,5 @@
export default {
compileOptions: {
prefix: 'me -'
prefix: 'm e'
}
};

@ -1 +1 @@
div.me-1tjtw78{color:blue}
div.me-xyz{color:blue}

@ -1,5 +1,5 @@
export default {
compileOptions: {
prefix: '0me-'
prefix: '0me'
}
};

@ -1 +1 @@
div.me-1tjtw78{color:blue}
div.me-xyz{color:blue}

@ -1,5 +1,5 @@
export default {
compileOptions: {
prefix: ' me-'
prefix: ' me'
}
};

@ -1 +1 @@
div.me-1tjtw78{color:blue}
div.me-xyz{color:blue}

@ -1,5 +1,5 @@
export default {
compileOptions: {
prefix: 'me-'
prefix: 'me'
}
};

@ -1 +1 @@
div.me-1tjtw78{color:blue}
div.me-xyz{color:blue}
Loading…
Cancel
Save