fix: don't call callback twice, masking potential errors

related to #238

Author: dummdidumm

CHANGELOG.md

@@ -1,5 +1,9 @@
 # svelte-loader changelog
 
+## 3.2.4
+
+* Don't call `callback` twice, masking potential errors
+
 ## 3.2.3
 
 * Svelte 5: Don't compile `.svelte/.../.xxx.js/ts` files

index.js

@@ -88,25 +88,29 @@ module.exports = function(source, map) {
 	const handleWarning = warning => this.emitWarning(new Error(warning));
 
 	if (getMajor() >= 5 && svelte_module_regex.test(this.resourcePath)) {
+		let js, warnings;
+
 		try {
-			const { js, warnings } = svelte.compileModule(
+			({ js, warnings } = svelte.compileModule(
 				source,
 				{ filename: this.resourcePath, dev: compileOptions.dev, generate: compileOptions.generate }
-			);
+			));
 
 			warnings.forEach(
 				options.onwarn
 					? warning => options.onwarn(warning, handleWarning)
 					: handleWarning
 			);
-
-			callback(null, js.code, js.map);
 		} catch (err) {
 			// wrap error to provide correct
 			// context when logging to console
 			callback(new Error(`${err.name}: ${err.toString()}`));
 		}
 
+		// outside try-catch - if this fails and we catch it,
+		// calling callback again will mask the error with a "already called" error
+		callback(null, js.code, js.map);
+
 		return;
 	}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-loader",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "author": "Nico Rehwaldt <[email protected]>",
   "description": "A webpack loader for svelte",
   "license": "MIT",