diff --git a/src/css/Stylesheet.ts b/src/css/Stylesheet.ts index 464dbd2500..3f5262fcc1 100644 --- a/src/css/Stylesheet.ts +++ b/src/css/Stylesheet.ts @@ -31,18 +31,18 @@ class Rule { return this.selectors.some(s => s.used); } - minify(code: MagicString, cascade: boolean, dev: boolean) { + minify(code: MagicString, dev: boolean) { let c = this.node.start; let started = false; this.selectors.forEach((selector, i) => { - if (cascade || selector.used) { + if (selector.used) { const separator = started ? ',' : ''; if ((selector.node.start - c) > separator.length) { code.overwrite(c, selector.node.start, separator); } - if (!cascade) selector.minify(code); + selector.minify(code); c = selector.node.end; started = true; @@ -66,39 +66,12 @@ class Rule { code.remove(c, this.node.block.end - 1); } - transform(code: MagicString, id: string, keyframes: Map, cascade: boolean) { + transform(code: MagicString, id: string, keyframes: Map) { if (this.parent && this.parent.node.type === 'Atrule' && this.parent.node.name === 'keyframes') return true; const attr = `.${id}`; - if (cascade) { - this.selectors.forEach(selector => { - // TODO disable cascading (without :global(...)) in v2 - const { start, end, children } = selector.node; - - const css = code.original; - const selectorString = css.slice(start, end); - - const firstToken = children[0]; - - let transformed; - - if (firstToken.type === 'TypeSelector') { - const insert = firstToken.end; - const head = firstToken.name === '*' ? '' : css.slice(start, insert); - const tail = css.slice(insert, end); - - transformed = `${head}${attr}${tail},${attr} ${selectorString}`; - } else { - transformed = `${attr}${selectorString},${attr} ${selectorString}`; - } - - code.overwrite(start, end, transformed); - }); - } else { - this.selectors.forEach(selector => selector.transform(code, attr)); - } - + this.selectors.forEach(selector => selector.transform(code, attr)); this.declarations.forEach(declaration => declaration.transform(code, keyframes)); } @@ -182,7 +155,7 @@ class Atrule { return true; // TODO } - minify(code: MagicString, cascade: boolean, dev: boolean) { + minify(code: MagicString, dev: boolean) { if (this.node.name === 'media') { const expressionChar = code.original[this.node.expression.start]; let c = this.node.start + (expressionChar === '(' ? 6 : 7); @@ -215,9 +188,9 @@ class Atrule { let c = this.node.block.start + 1; this.children.forEach(child => { - if (cascade || child.isUsed(dev)) { + if (child.isUsed(dev)) { code.remove(c, child.node.start); - child.minify(code, cascade, dev); + child.minify(code, dev); c = child.node.end; } }); @@ -226,7 +199,7 @@ class Atrule { } } - transform(code: MagicString, id: string, keyframes: Map, cascade: boolean) { + transform(code: MagicString, id: string, keyframes: Map) { if (this.node.name === 'keyframes') { this.node.expression.children.forEach(({ type, name, start, end }: Node) => { if (type === 'Identifier') { @@ -240,7 +213,7 @@ class Atrule { } this.children.forEach(child => { - child.transform(code, id, keyframes, cascade); + child.transform(code, id, keyframes); }) } @@ -264,7 +237,6 @@ const keys = {}; export default class Stylesheet { source: string; parsed: Parsed; - cascade: boolean; filename: string; dev: boolean; @@ -276,10 +248,9 @@ export default class Stylesheet { nodesWithCssClass: Set; - constructor(source: string, parsed: Parsed, filename: string, cascade: boolean, dev: boolean) { + constructor(source: string, parsed: Parsed, filename: string, dev: boolean) { this.source = source; this.parsed = parsed; - this.cascade = cascade; this.filename = filename; this.dev = dev; @@ -356,11 +327,6 @@ export default class Stylesheet { if (parent.type === 'Element') stack.unshift(parent); } - if (this.cascade) { - if (stack.length === 0) this.nodesWithCssClass.add(node); - return; - } - for (let i = 0; i < this.children.length; i += 1) { const child = this.children[i]; child.apply(node, stack); @@ -389,15 +355,15 @@ export default class Stylesheet { if (shouldTransformSelectors) { this.children.forEach((child: (Atrule|Rule)) => { - child.transform(code, this.id, this.keyframes, this.cascade); + child.transform(code, this.id, this.keyframes); }); } let c = 0; this.children.forEach(child => { - if (this.cascade || child.isUsed(this.dev)) { + if (child.isUsed(this.dev)) { code.remove(c, child.node.start); - child.minify(code, this.cascade, this.dev); + child.minify(code, this.dev); c = child.node.end; } }); @@ -421,8 +387,6 @@ export default class Stylesheet { } warnOnUnusedSelectors(onwarn: (warning: Warning) => void) { - if (this.cascade) return; - let locator; const handler = (selector: Selector) => { diff --git a/src/index.ts b/src/index.ts index 1b297e3d29..875202118b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -124,7 +124,7 @@ function compile(source: string, _options: CompileOptions) { } stats.start('stylesheet'); - const stylesheet = new Stylesheet(source, parsed, options.filename, options.cascade !== false, options.dev); + const stylesheet = new Stylesheet(source, parsed, options.filename, options.dev); stats.stop('stylesheet'); stats.start('validate'); diff --git a/test/css/samples/attribute-selector-only-name/_config.js b/test/css/samples/attribute-selector-only-name/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/attribute-selector-only-name/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/attribute-selector-unquoted/_config.js b/test/css/samples/attribute-selector-unquoted/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/attribute-selector-unquoted/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/basic/expected.css b/test/css/samples/basic/expected.css index 49670b1fd5..d466e8df96 100644 --- a/test/css/samples/basic/expected.css +++ b/test/css/samples/basic/expected.css @@ -1 +1 @@ -div.svelte-xyz,.svelte-xyz div{color:red} \ No newline at end of file +div.svelte-xyz{color:red} \ No newline at end of file diff --git a/test/css/samples/cascade-false-empty-rule/_config.js b/test/css/samples/cascade-false-empty-rule/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-empty-rule/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-global-keyframes/_config.js b/test/css/samples/cascade-false-global-keyframes/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-global-keyframes/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-global/_config.js b/test/css/samples/cascade-false-global/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-global/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-keyframes-from-to/_config.js b/test/css/samples/cascade-false-keyframes-from-to/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-keyframes-from-to/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-keyframes/_config.js b/test/css/samples/cascade-false-keyframes/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-keyframes/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-keyframes/expected.css b/test/css/samples/cascade-false-keyframes/expected.css deleted file mode 100644 index a6a1176dae..0000000000 --- a/test/css/samples/cascade-false-keyframes/expected.css +++ /dev/null @@ -1 +0,0 @@ -@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated.svelte-xyz{animation:svelte-xyz-why 2s}.also-animated.svelte-xyz{animation:not-defined-here 2s} \ No newline at end of file diff --git a/test/css/samples/cascade-false-keyframes/input.html b/test/css/samples/cascade-false-keyframes/input.html deleted file mode 100644 index ba220a5e22..0000000000 --- a/test/css/samples/cascade-false-keyframes/input.html +++ /dev/null @@ -1,17 +0,0 @@ -
animated
-
also animated
- - \ No newline at end of file diff --git a/test/css/samples/cascade-false-pseudo-element/_config.js b/test/css/samples/cascade-false-pseudo-element/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-pseudo-element/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-universal-selector/_config.js b/test/css/samples/cascade-false-universal-selector/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false-universal-selector/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-universal-selector/expected.css b/test/css/samples/cascade-false-universal-selector/expected.css deleted file mode 100644 index 3eda95e446..0000000000 --- a/test/css/samples/cascade-false-universal-selector/expected.css +++ /dev/null @@ -1 +0,0 @@ -.svelte-xyz{color:red} \ No newline at end of file diff --git a/test/css/samples/cascade-false-universal-selector/expected.html b/test/css/samples/cascade-false-universal-selector/expected.html deleted file mode 100644 index be0c650916..0000000000 --- a/test/css/samples/cascade-false-universal-selector/expected.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/test/css/samples/cascade-false-universal-selector/input.html b/test/css/samples/cascade-false-universal-selector/input.html deleted file mode 100644 index 36a65e23e6..0000000000 --- a/test/css/samples/cascade-false-universal-selector/input.html +++ /dev/null @@ -1,7 +0,0 @@ -
- - \ No newline at end of file diff --git a/test/css/samples/cascade-false/_config.js b/test/css/samples/cascade-false/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/cascade-false/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false/expected.css b/test/css/samples/cascade-false/expected.css deleted file mode 100644 index 797d245dde..0000000000 --- a/test/css/samples/cascade-false/expected.css +++ /dev/null @@ -1 +0,0 @@ -div.svelte-xyz{color:red}div.foo.svelte-xyz{color:blue}.foo.svelte-xyz{font-weight:bold} \ No newline at end of file diff --git a/test/css/samples/cascade-false/input.html b/test/css/samples/cascade-false/input.html deleted file mode 100644 index f56b586ef8..0000000000 --- a/test/css/samples/cascade-false/input.html +++ /dev/null @@ -1,16 +0,0 @@ -
red
-
bold/blue
- - \ No newline at end of file diff --git a/test/css/samples/combinator-child/_config.js b/test/css/samples/combinator-child/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/combinator-child/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/css-vars/expected.css b/test/css/samples/css-vars/expected.css index 1b3a42567a..ccb7a3ec48 100644 --- a/test/css/samples/css-vars/expected.css +++ b/test/css/samples/css-vars/expected.css @@ -1 +1 @@ -div.svelte-xyz,.svelte-xyz div{--test:10} \ No newline at end of file +div.svelte-xyz{--test:10} \ No newline at end of file diff --git a/test/css/samples/descendant-selector-non-top-level-outer/_config.js b/test/css/samples/descendant-selector-non-top-level-outer/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/descendant-selector-non-top-level-outer/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/empty-class/_config.js b/test/css/samples/empty-class/_config.js index e4953939ae..5ffb0321bb 100644 --- a/test/css/samples/empty-class/_config.js +++ b/test/css/samples/empty-class/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - warnings: [{ filename: "SvelteComponent.html", code: `css-unused-selector`, diff --git a/test/css/samples/cascade-false-empty-rule-dev/_config.js b/test/css/samples/empty-rule-dev/_config.js similarity index 59% rename from test/css/samples/cascade-false-empty-rule-dev/_config.js rename to test/css/samples/empty-rule-dev/_config.js index 8b2e3aa341..e26996239d 100644 --- a/test/css/samples/cascade-false-empty-rule-dev/_config.js +++ b/test/css/samples/empty-rule-dev/_config.js @@ -1,4 +1,3 @@ export default { - cascade: false, dev: true }; \ No newline at end of file diff --git a/test/css/samples/cascade-false-empty-rule-dev/expected.css b/test/css/samples/empty-rule-dev/expected.css similarity index 100% rename from test/css/samples/cascade-false-empty-rule-dev/expected.css rename to test/css/samples/empty-rule-dev/expected.css diff --git a/test/css/samples/cascade-false-empty-rule-dev/input.html b/test/css/samples/empty-rule-dev/input.html similarity index 100% rename from test/css/samples/cascade-false-empty-rule-dev/input.html rename to test/css/samples/empty-rule-dev/input.html diff --git a/test/css/samples/cascade-false-empty-rule/expected.css b/test/css/samples/empty-rule/expected.css similarity index 100% rename from test/css/samples/cascade-false-empty-rule/expected.css rename to test/css/samples/empty-rule/expected.css diff --git a/test/css/samples/cascade-false-empty-rule/input.html b/test/css/samples/empty-rule/input.html similarity index 100% rename from test/css/samples/cascade-false-empty-rule/input.html rename to test/css/samples/empty-rule/input.html diff --git a/test/css/samples/cascade-false-global-keyframes/expected.css b/test/css/samples/global-keyframes/expected.css similarity index 100% rename from test/css/samples/cascade-false-global-keyframes/expected.css rename to test/css/samples/global-keyframes/expected.css diff --git a/test/css/samples/cascade-false-global-keyframes/input.html b/test/css/samples/global-keyframes/input.html similarity index 100% rename from test/css/samples/cascade-false-global-keyframes/input.html rename to test/css/samples/global-keyframes/input.html diff --git a/test/css/samples/cascade-false-global/expected.css b/test/css/samples/global/expected.css similarity index 100% rename from test/css/samples/cascade-false-global/expected.css rename to test/css/samples/global/expected.css diff --git a/test/css/samples/cascade-false-global/input.html b/test/css/samples/global/input.html similarity index 100% rename from test/css/samples/cascade-false-global/input.html rename to test/css/samples/global/input.html diff --git a/test/css/samples/cascade-false-keyframes-from-to/expected.css b/test/css/samples/keyframes-from-to/expected.css similarity index 100% rename from test/css/samples/cascade-false-keyframes-from-to/expected.css rename to test/css/samples/keyframes-from-to/expected.css diff --git a/test/css/samples/cascade-false-keyframes-from-to/input.html b/test/css/samples/keyframes-from-to/input.html similarity index 100% rename from test/css/samples/cascade-false-keyframes-from-to/input.html rename to test/css/samples/keyframes-from-to/input.html diff --git a/test/css/samples/keyframes/expected.css b/test/css/samples/keyframes/expected.css index 810ba87751..a6a1176dae 100644 --- a/test/css/samples/keyframes/expected.css +++ b/test/css/samples/keyframes/expected.css @@ -1 +1 @@ -@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.svelte-xyz.animated,.svelte-xyz .animated{animation:svelte-xyz-why 2s} \ No newline at end of file +@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated.svelte-xyz{animation:svelte-xyz-why 2s}.also-animated.svelte-xyz{animation:not-defined-here 2s} \ No newline at end of file diff --git a/test/css/samples/keyframes/input.html b/test/css/samples/keyframes/input.html index b4d120f34f..ba220a5e22 100644 --- a/test/css/samples/keyframes/input.html +++ b/test/css/samples/keyframes/input.html @@ -1,4 +1,5 @@
animated
+
also animated
\ No newline at end of file diff --git a/test/css/samples/media-query-word/expected.css b/test/css/samples/media-query-word/expected.css index 592ba7e61d..d2a288ed72 100644 --- a/test/css/samples/media-query-word/expected.css +++ b/test/css/samples/media-query-word/expected.css @@ -1 +1 @@ -@media only screen and (min-width: 400px){div.svelte-xyz,.svelte-xyz div{color:red}} \ No newline at end of file +@media only screen and (min-width: 400px){div.svelte-xyz{color:red}} \ No newline at end of file diff --git a/test/css/samples/media-query/expected.css b/test/css/samples/media-query/expected.css index 689161de04..8ea74bf3b1 100644 --- a/test/css/samples/media-query/expected.css +++ b/test/css/samples/media-query/expected.css @@ -1 +1 @@ -@media(min-width: 400px){.svelte-xyz.large-screen,.svelte-xyz .large-screen{display:block}} \ No newline at end of file +@media(min-width: 400px){.large-screen.svelte-xyz{display:block}} \ No newline at end of file diff --git a/test/css/samples/cascade-false-nested/_config.js b/test/css/samples/nested/_config.js similarity index 68% rename from test/css/samples/cascade-false-nested/_config.js rename to test/css/samples/nested/_config.js index b19fe39d23..7cf5c058a6 100644 --- a/test/css/samples/cascade-false-nested/_config.js +++ b/test/css/samples/nested/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { dynamic: 'x' } diff --git a/test/css/samples/cascade-false-nested/expected.css b/test/css/samples/nested/expected.css similarity index 100% rename from test/css/samples/cascade-false-nested/expected.css rename to test/css/samples/nested/expected.css diff --git a/test/css/samples/cascade-false-nested/expected.html b/test/css/samples/nested/expected.html similarity index 100% rename from test/css/samples/cascade-false-nested/expected.html rename to test/css/samples/nested/expected.html diff --git a/test/css/samples/cascade-false-nested/input.html b/test/css/samples/nested/input.html similarity index 100% rename from test/css/samples/cascade-false-nested/input.html rename to test/css/samples/nested/input.html diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-contains/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-contains/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-contains/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js index 32cdf8cb79..83f70a7c02 100644 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js +++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js @@ -1,5 +1,4 @@ export default { - cascade: false, data: { dynamic: 'whatever' } diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-equals/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-attribute-selector/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-class-dynamic/_config.js b/test/css/samples/omit-scoping-attribute-class-dynamic/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-class-dynamic/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-class-static/_config.js b/test/css/samples/omit-scoping-attribute-class-static/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-class-static/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-descendant/_config.js b/test/css/samples/omit-scoping-attribute-descendant/_config.js index 1bad4343aa..1fb3055ae1 100644 --- a/test/css/samples/omit-scoping-attribute-descendant/_config.js +++ b/test/css/samples/omit-scoping-attribute-descendant/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - warnings: [{ code: `css-unused-selector`, message: 'Unused CSS selector', diff --git a/test/css/samples/omit-scoping-attribute-global/_config.js b/test/css/samples/omit-scoping-attribute-global/_config.js index 0371e65c7e..4b4ce74d72 100644 --- a/test/css/samples/omit-scoping-attribute-global/_config.js +++ b/test/css/samples/omit-scoping-attribute-global/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { raw: '

raw

' } diff --git a/test/css/samples/omit-scoping-attribute-id/_config.js b/test/css/samples/omit-scoping-attribute-id/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-id/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-whitespace-multiple/_config.js b/test/css/samples/omit-scoping-attribute-whitespace-multiple/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-whitespace-multiple/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute-whitespace/_config.js b/test/css/samples/omit-scoping-attribute-whitespace/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute-whitespace/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/omit-scoping-attribute/_config.js b/test/css/samples/omit-scoping-attribute/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/omit-scoping-attribute/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-pseudo-element/expected.css b/test/css/samples/pseudo-element/expected.css similarity index 100% rename from test/css/samples/cascade-false-pseudo-element/expected.css rename to test/css/samples/pseudo-element/expected.css diff --git a/test/css/samples/cascade-false-pseudo-element/input.html b/test/css/samples/pseudo-element/input.html similarity index 100% rename from test/css/samples/cascade-false-pseudo-element/input.html rename to test/css/samples/pseudo-element/input.html diff --git a/test/css/samples/refs-qualified/_config.js b/test/css/samples/refs-qualified/_config.js index 832d6fbe02..9f75d743cc 100644 --- a/test/css/samples/refs-qualified/_config.js +++ b/test/css/samples/refs-qualified/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { active: true }, diff --git a/test/css/samples/refs/_config.js b/test/css/samples/refs/_config.js index 3136799de0..4c684d76e5 100644 --- a/test/css/samples/refs/_config.js +++ b/test/css/samples/refs/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - warnings: [{ code: `css-unused-selector`, message: 'Unused CSS selector', diff --git a/test/css/samples/spread/_config.js b/test/css/samples/spread/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/css/samples/spread/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/css/samples/supports-query/_config.js b/test/css/samples/supports-query/_config.js deleted file mode 100644 index c66e0e5271..0000000000 --- a/test/css/samples/supports-query/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; diff --git a/test/css/samples/universal-selector/expected.css b/test/css/samples/universal-selector/expected.css index 70eaaedf3e..3eda95e446 100644 --- a/test/css/samples/universal-selector/expected.css +++ b/test/css/samples/universal-selector/expected.css @@ -1 +1 @@ -.svelte-xyz,.svelte-xyz *{color:red} \ No newline at end of file +.svelte-xyz{color:red} \ No newline at end of file diff --git a/test/css/samples/unknown-at-rule/expected.css b/test/css/samples/unknown-at-rule/expected.css index d175e2a807..31c3bf9c6f 100644 --- a/test/css/samples/unknown-at-rule/expected.css +++ b/test/css/samples/unknown-at-rule/expected.css @@ -1 +1 @@ -div.svelte-xyz,.svelte-xyz div{@apply --funky-div;} \ No newline at end of file +div.svelte-xyz{@apply --funky-div;} \ No newline at end of file diff --git a/test/css/samples/unused-selector-leading/_config.js b/test/css/samples/unused-selector-leading/_config.js index fecc03e31d..ec245fe80a 100644 --- a/test/css/samples/unused-selector-leading/_config.js +++ b/test/css/samples/unused-selector-leading/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - warnings: [ { filename: "SvelteComponent.html", diff --git a/test/css/samples/unused-selector-ternary/_config.js b/test/css/samples/unused-selector-ternary/_config.js index 31e93bd177..f4f7826ffc 100644 --- a/test/css/samples/unused-selector-ternary/_config.js +++ b/test/css/samples/unused-selector-ternary/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - data: { active: true }, diff --git a/test/css/samples/unused-selector/_config.js b/test/css/samples/unused-selector/_config.js index a86a2c2847..23f4f75771 100644 --- a/test/css/samples/unused-selector/_config.js +++ b/test/css/samples/unused-selector/_config.js @@ -1,6 +1,4 @@ export default { - cascade: false, - warnings: [{ filename: "SvelteComponent.html", code: `css-unused-selector`, diff --git a/test/runtime/samples/svg-with-style/_config.js b/test/runtime/samples/svg-with-style/_config.js index 254a94d77d..e4cbe253ea 100644 --- a/test/runtime/samples/svg-with-style/_config.js +++ b/test/runtime/samples/svg-with-style/_config.js @@ -1,8 +1,4 @@ export default { - compileOptions: { - cascade: false - }, - data: { x: 'bar' }, diff --git a/test/server-side-rendering/samples/styles-nested/_actual.css b/test/server-side-rendering/samples/styles-nested/_actual.css index 737a93edff..775ae8a91c 100644 --- a/test/server-side-rendering/samples/styles-nested/_actual.css +++ b/test/server-side-rendering/samples/styles-nested/_actual.css @@ -1,2 +1,2 @@ -div.svelte-bzh57p,.svelte-bzh57p div{color:red} -div.svelte-4yw8vx,.svelte-4yw8vx div{color:green} \ No newline at end of file +div.svelte-bzh57p{color:red} +div.svelte-4yw8vx{color:green} \ No newline at end of file diff --git a/test/server-side-rendering/samples/styles/_actual.css b/test/server-side-rendering/samples/styles/_actual.css index f54b1b3d50..2025c64f84 100644 --- a/test/server-side-rendering/samples/styles/_actual.css +++ b/test/server-side-rendering/samples/styles/_actual.css @@ -1 +1 @@ -div.svelte-bzh57p,.svelte-bzh57p div{color:red} \ No newline at end of file +div.svelte-bzh57p{color:red} \ No newline at end of file diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js index 59342cbe6f..eade146f39 100644 --- a/test/sourcemaps/index.js +++ b/test/sourcemaps/index.js @@ -30,8 +30,7 @@ describe("sourcemaps", () => { const { js, css } = svelte.compile(input, { filename, outputFilename: `${outputFilename}.js`, - cssOutputFilename: `${outputFilename}.css`, - cascade: config.cascade + cssOutputFilename: `${outputFilename}.css` }); const _code = js.code.replace(/Svelte v\d+\.\d+\.\d+/, match => match.replace(/\d/g, 'x')); diff --git a/test/sourcemaps/samples/css-cascade-false/_config.js b/test/sourcemaps/samples/css-cascade-false/_config.js deleted file mode 100644 index b37866f9b6..0000000000 --- a/test/sourcemaps/samples/css-cascade-false/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - cascade: false -}; \ No newline at end of file diff --git a/test/sourcemaps/samples/css-cascade-false/input.html b/test/sourcemaps/samples/css-cascade-false/input.html deleted file mode 100644 index ad0845d15b..0000000000 --- a/test/sourcemaps/samples/css-cascade-false/input.html +++ /dev/null @@ -1,7 +0,0 @@ -

red

- - \ No newline at end of file diff --git a/test/sourcemaps/samples/css-cascade-false/output.css b/test/sourcemaps/samples/css-cascade-false/output.css deleted file mode 100644 index f12b3f22b9..0000000000 --- a/test/sourcemaps/samples/css-cascade-false/output.css +++ /dev/null @@ -1,2 +0,0 @@ -.foo.svelte-sg04hs{color:red} -/*# sourceMappingURL=output.css.map */ \ No newline at end of file diff --git a/test/sourcemaps/samples/css-cascade-false/output.css.map b/test/sourcemaps/samples/css-cascade-false/output.css.map deleted file mode 100644 index 23b5df6be3..0000000000 --- a/test/sourcemaps/samples/css-cascade-false/output.css.map +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 3, - "file": "output.css", - "sources": [ - "input.html" - ], - "sourcesContent": [ - "

red

\n\n" - ], - "names": [], - "mappings": "AAGC,IAAI,cAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC" -} \ No newline at end of file diff --git a/test/sourcemaps/samples/css-cascade-false/test.js b/test/sourcemaps/samples/css-cascade-false/test.js deleted file mode 100644 index 0c9d7e9b6e..0000000000 --- a/test/sourcemaps/samples/css-cascade-false/test.js +++ /dev/null @@ -1,17 +0,0 @@ -export function test ({ assert, smcCss, locateInSource, locateInGeneratedCss }) { - const expected = locateInSource( '.foo' ); - - const loc = locateInGeneratedCss( '.foo' ); - - const actual = smcCss.originalPositionFor({ - line: loc.line + 1, - column: loc.column - }); - - assert.deepEqual( actual, { - source: 'input.html', - name: null, - line: expected.line + 1, - column: expected.column - }); -} diff --git a/test/sourcemaps/samples/css/output.css b/test/sourcemaps/samples/css/output.css index 7ac11b6e42..f12b3f22b9 100644 --- a/test/sourcemaps/samples/css/output.css +++ b/test/sourcemaps/samples/css/output.css @@ -1,2 +1,2 @@ -.svelte-sg04hs.foo,.svelte-sg04hs .foo{color:red} +.foo.svelte-sg04hs{color:red} /*# sourceMappingURL=output.css.map */ \ No newline at end of file diff --git a/test/sourcemaps/samples/css/output.css.map b/test/sourcemaps/samples/css/output.css.map index bc5a58446a..23b5df6be3 100644 --- a/test/sourcemaps/samples/css/output.css.map +++ b/test/sourcemaps/samples/css/output.css.map @@ -8,5 +8,5 @@ "

red

\n\n" ], "names": [], - "mappings": "AAGC,sCAAK,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC" + "mappings": "AAGC,IAAI,cAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC" } \ No newline at end of file