Merge pull request #51 from sveltejs/gh-41

deprecate options.style etc

Author: Rich-Harris

index.js

@@ -63,6 +63,23 @@ function normalize(compiled) {
 	return { js, css, ast: compiled.ast };
 }
 
+const warned = {};
+function deprecatePreprocessOptions(options) {
+	const preprocessOptions = {};
+
+	['markup', 'style', 'script'].forEach(kind => {
+		if (options[kind]) {
+			if (!warned[kind]) {
+				console.warn(`[svelte-loader] DEPRECATION: options.${kind} is now options.preprocess.${kind}`);
+				warned[kind] = true;
+			}
+			preprocessOptions[kind] = options[kind];
+		}
+	});
+
+	options.preprocess = options.preprocess || preprocessOptions;
+}
+
 module.exports = function(source, map) {
 	this.cacheable();
 
@@ -86,7 +103,10 @@ module.exports = function(source, map) {
 
 	if (!options.onwarn) options.onwarn = warning => this.emitWarning(new Error(warning));
 
-	preprocess(source, options).then(processed => {
+	deprecatePreprocessOptions(options);
+	options.preprocess.filename = options.filename;
+
+	preprocess(source, options.preprocess).then(processed => {
 		let { js, css, ast } = normalize(compile(processed.toString(), options));
 
 		if (options.emitCss && css.code) {

test/loader.spec.js

@@ -294,10 +294,12 @@ describe('loader', () => {
 				});
 				const callbackSpy = spy(cb);
 				const options = {
-					style: ({ content }) => {
-						return {
-							code: content.replace(/\$size/gi, '50px'),
-						};
+					preprocess: {
+						style: ({ content }) => {
+							return {
+								code: content.replace(/\$size/gi, '50px'),
+							};
+						}
 					},
 				};
 
@@ -321,9 +323,11 @@ describe('loader', () => {
 				const cacheableSpy = spy(() => {
 				});
 				const options = {
-					style: () => {
-						throw new Error('Error while preprocessing');
-					},
+					preprocess: {
+						style: () => {
+							throw new Error('Error while preprocessing');
+						}
+					}
 				};
 
 				loader.call(
@@ -342,6 +346,32 @@ describe('loader', () => {
 			});
 		});
 
+
+		describe('deprecations', () => {
+			it('should warn on options.style', done => {
+				const { warn } = console;
+				const warnings = [];
+
+				console.warn = (msg) => {
+					warnings.push(msg);
+				};
+
+				testLoader('test/fixtures/style-valid.html', (err, code, map) => {
+					expect(code).to.contain('50px');
+					expect(warnings).to.deep.equal([
+						'[svelte-loader] DEPRECATION: options.style is now options.preprocess.style'
+					]);
+					console.warn = warn;
+				}, {
+					style: ({ content }) => {
+						return {
+							code: content.replace(/\$size/gi, '50px'),
+						};
+					}
+				})(done);
+			});
+		});
+
 		describe('hotReload', () => {
 			it(
 				'should configure hotReload=false (default)',