mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-12-01 17:30:59 +01:00
Code Issues Releases Wiki Activity

tidy up, add sourcemaps to add_css function

Browse Source
This commit is contained in:
Rich Harris 2017-07-08 09:38:07 -04:00
parent 45039e9612
commit f2db3ea828
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/generators/Generator.ts
View File

@ -80,7 +80,6 @@ export default class Generator {
// TODO this is legacy — just to get the tests to pass during the transition
this.css = this.stylesheet.render(options.cssOutputFilename).css;
this.cssId = `svelte-${parsed.hash}`;
// allow compiler to deconflict user's `import { get } from 'whatever'` and
// Svelte's builtin `import { get, ... } from 'svelte/shared.ts'`;

16
src/generators/dom/index.ts
View File

@ -135,12 +135,18 @@ export default function dom(
builder.addBlock(`[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`);
}
if (generator.css && options.css !== false) {
if (generator.stylesheet.hasStyles && options.css !== false) {
const { css, cssMap } = generator.stylesheet.render(options.filename);
const textContent = options.dev ?
`${css}\n/*# sourceMappingURL=${cssMap.toUrl()} */` :
css;
builder.addBlock(deindent`
function @add_css () {
var style = @createElement( 'style' );
style.id = '${generator.cssId}-style';
style.textContent = ${stringify(generator.css)};
style.id = '${generator.stylesheet.id}-style';
style.textContent = ${JSON.stringify(textContent)};
@appendNode( style, document.head );
}
`);
@ -199,9 +205,9 @@ export default function dom(
this._yield = options._yield;
this._torndown = false;
${generator.css &&
${generator.stylesheet.hasStyles &&
options.css !== false &&
`if ( !document.getElementById( '${generator.cssId}-style' ) ) @add_css();`}
`if ( !document.getElementById( '${generator.stylesheet.id}-style' ) ) @add_css();`}
${(generator.hasComponents || generator.hasIntroTransitions) &&
`this._oncreate = [];`}
${generator.hasComplexBindings && `this._bindings = [];`}

2
src/generators/dom/visitors/Element/Element.ts
View File

@ -84,7 +84,7 @@ export default function visitElement(
// TODO add a helper for this, rather than repeating it
if (node._needsCssAttribute) {
block.builders.hydrate.addLine(
`@setAttribute( ${name}, '${generator.cssId}', '' );`
`@setAttribute( ${name}, '${generator.stylesheet.id}', '' );`
);
}

8
src/generators/server-side-rendering/index.ts
View File

@ -86,6 +86,8 @@ export default function ssr(
visit(generator, mainBlock, node);
});
const { css, cssMap } = generator.stylesheet.render(options.filename);
const result = deindent`
${hasJs && `[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`}
@ -127,12 +129,12 @@ export default function ssr(
${name}.renderCss = function () {
var components = [];
${generator.css &&
${generator.stylesheet.hasStyles &&
deindent`
components.push({
filename: ${name}.filename,
css: ${JSON.stringify(generator.css)},
map: null // TODO
css: ${JSON.stringify(css)},
map: ${JSON.stringify(cssMap)}
});
`}

2
src/generators/server-side-rendering/visitors/Element.ts
View File

@ -57,7 +57,7 @@ export default function visitElement(
});
if (node._needsCssAttribute) {
openingTag += ` ${generator.cssId}`;
openingTag += ` ${generator.stylesheet.id}`;
}
openingTag += '>';