Skip to content

Fix emitcss #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rich-Harris merged 4 commits into from
May 1, 2018
Merged

Fix emitcss #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7e0634
Generate components CSS on virtual files
kaisermann Apr 21, 2018
584469f
Update webpack-virtual-modules to fix error on watch
kaisermann Apr 25, 2018
7e3f749
Replace random number on virtual filenames with ".svelte"
kaisermann Apr 25, 2018
330decd
Only write virtual files if there's a webpack instance initialized. M…
kaisermann Apr 29, 2018
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
28 changes: 16 additions & 12 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const { basename, extname, posix, relative } = require('path');
const { basename, extname, relative } = require('path');
const { compile, preprocess } = require('svelte');
const { getOptions } = require('loader-utils');
const { statSync, utimesSync, writeFileSync } = require('fs');
const { tmpdir } = require('os');
const VirtualModulesPlugin = require('webpack-virtual-modules');

const hotApi = require.resolve('./lib/hot-api.js');
const virtualModules = new VirtualModulesPlugin();

function makeHot(id, code, hotOptions) {
const options = JSON.stringify(hotOptions);
Expand Down Expand Up @@ -107,18 +107,19 @@ module.exports = function(source, map) {
options.preprocess.filename = options.filename;

preprocess(source, options.preprocess).then(processed => {
let { js, css, ast } = normalize(compile(processed.toString(), options));
let { js, css } = normalize(compile(processed.toString(), options));

if (options.emitCss && css.code) {
const posixTmpdir = posixify(tmpdir());
const tmpFile = posix.join(posixTmpdir, 'svelte-' + ast.hash + '.css');

const cssFilepath = options.filename.replace(
/\.[^/.]+$/,
`.svelte.css`
);
css.code += '\n/*# sourceMappingURL=' + css.map.toUrl() + '*/';
js.code = js.code + `\nrequire('${tmpFile}');\n`;

writeFileSync(tmpFile, css.code);
const { atime, mtime } = statSync(tmpFile);
utimesSync(tmpFile, new Date(atime.getTime() - 99999), new Date(mtime.getTime() - 99999));
js.code = js.code + `\nrequire('${cssFilepath}');\n`;
/** If the webpack compiler is initialized, write the file to its vitual file system */
if (this.fs) {
virtualModules.writeModule(cssFilepath, css.code);
}
}

if (options.hotReload && !isProduction && !isServer) {
Expand All @@ -134,3 +135,6 @@ module.exports = function(source, map) {
callback(new Error(`${err.name}: ${err.toString()}`));
});
};

module.exports.plugin = virtualModules;
module.exports.loader = __filename;
Loading