Preprocessing

.gitignore

@@ -1 +1,3 @@
-node_modules/
+node_modules/
+.idea/
+*.iml

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
-node_js: '8.0'
+node_js:
+- '9'
+- '8'
+- '6'
 
 script:
 - npm run all

index.js

@@ -1,16 +1,16 @@
 const { basename, extname } = require('path');
-const { compile } = require('svelte');
+const { compile, preprocess } = require('svelte');
 const { getOptions } = require('loader-utils');
 const { statSync, utimesSync, writeFileSync } = require('fs');
 const { fileSync } = require('tmp');
 
 function sanitize(input) {
-	return basename(input)
-		.replace(extname(input), '')
-		.replace(/[^a-zA-Z_$0-9]+/g, '_')
-		.replace(/^_/, '')
-		.replace(/_$/, '')
-		.replace(/^(\d)/, '_$1');
+	return basename(input).
+			replace(extname(input), '').
+			replace(/[^a-zA-Z_$0-9]+/g, '_').
+			replace(/^_/, '').
+			replace(/_$/, '').
+			replace(/^(\d)/, '_$1');
 }
 
 function capitalize(str) {
@@ -20,34 +20,35 @@ function capitalize(str) {
 module.exports = function(source, map) {
 	this.cacheable();
 
-	const options = getOptions(this) || {};
+	const options = Object.assign({}, this.options, getOptions(this));
+	const callback = this.async();
 
 	options.filename = this.resourcePath;
 	options.format = this.version === 1 ? options.format || 'cjs' : 'es';
 	options.shared =
-		options.format === 'es' && require.resolve('svelte/shared.js');
+			options.format === 'es' && require.resolve('svelte/shared.js');
 
 	if (options.emitCss) options.css = false;
 
 	if (!options.name) options.name = capitalize(sanitize(options.filename));
 
-	try {
-		let { code, map, css, cssMap } = compile(source, options);
+	preprocess(source, options).then(processed => {
+		let { code, map, css, cssMap } = compile(processed.toString(), options);
 
 		if (options.emitCss && css) {
 			const tmpobj = fileSync({ postfix: '.css' });
 			css += '\n/*# sourceMappingURL=' + cssMap.toUrl() + '*/';
 			code = code + `\nrequire('${tmpobj.name}');\n`;
 
 			writeFileSync(tmpobj.name, css);
-			const stats = statSync(tmpobj.name);
-			utimesSync(tmpobj.name, stats.atimeMs - 9999, stats.mtimeMs - 9999);
+			const { atime, mtime } = statSync(tmpobj.name);
+			utimesSync(tmpobj.name, atime.getTime() - 9999, mtime.getTime() - 9999);
 		}
 
-		this.callback(null, code, map);
-	} catch (err) {
+		callback(null, code, map);
+	}, err => callback(err)).catch(err => {
 		// wrap error to provide correct
 		// context when logging to console
-		this.callback(new Error(err.toString() + '\n' + err.frame));
-	}
+		callback(new Error(`${err.name}: ${err.toString()}`));
+	});
 };

package.json

@@ -25,10 +25,10 @@
     "mocha": "^3.2.0",
     "sinon": "^1.17.6",
     "sinon-chai": "^2.8.0",
-    "svelte": "^1.6.0"
+    "svelte": "^1.47.2"
   },
   "peerDependencies": {
-    "svelte": "^1.0.7"
+    "svelte": "^1.44.0"
   },
   "repository": {
     "type": "git",

test/fixtures/style-valid.html

@@ -0,0 +1,8 @@
+<button>+1</button>
+​
+<style type="text/scss">
+  button {
+    width: $size;
+    height: $size;
+  }
+</style>