bundle-marked-loader - npm Package Compare versions

Comparing version 0.6.1 to 0.7.0

index.js

@@ -24,26 +24,44 @@ /*
 		result = [
-			"var fn = function(cb) {\n",
-			"	require.ensure([], function(require) {\n",
-			"		cb(require(", loaderUtils.stringifyRequest(this, "!!" + remainingRequest), "));\n",
-			"	}" + chunkNameParam + ");\n",
+			"var fn = function(onSuccessCb, onErrorCb) {\n",
+			"	var result = require.ensure([], function(require) {\n",
+			"		onSuccessCb(require(", loaderUtils.stringifyRequest(this, "!!" + remainingRequest), "));\n",
+			"	}" + chunkNameParam + ")\n;",
+			"	if (result.catch && onErrorCb) {\n",
+			"		result.catch(onErrorCb);\n",
+			"	}\n",
 			"};\n",
-            "\n",
-            "fn.isLazy = true;\n",
-            "module.exports = fn;"];
+			"\n",
+			"fn.isLazy = true;\n",
+			"module.exports = fn;"];
 	} else {
 		result = [
-			"var cbs = [], \n",
+			"var onSuccessCbs = [],\n",
+			"var onErrorCbs = [],\n",
 			"	data;\n",
-			"module.exports = function(cb) {\n",
-			"	if(cbs) cbs.push(cb);\n",
-			"	else cb(data);\n",
+			"	error;\n",
+			"module.exports = function(onSuccessCb, onErrorCb) {\n",
+			"	if(onSuccessCbs) onSuccessCbs.push(onSuccessCb);\n",
+			"	else onSuccessCb(data);\n",
+			"	if(onErrorCbs) onErrorCbs.push(onErrorCb);\n",
+			"	else if (onErrorCb) onErrorCb(error);\n",
 			"}\n",
-			"require.ensure([], function(require) {\n",
+			"var result = require.ensure([], function(require) {\n",
 			"	data = require(", loaderUtils.stringifyRequest(this, "!!" + remainingRequest), ");\n",
-			"	var callbacks = cbs;\n",
-			"	cbs = null;\n",
+			"	var callbacks = onSuccessCbs;\n",
+			"	onSuccessCbs = null;\n",
 			"	for(var i = 0, l = callbacks.length; i < l; i++) {\n",
 			"		callbacks[i](data);\n",
 			"	}\n",
-			"}" + chunkNameParam + ");"];
+			"}" + chunkNameParam + ");\n",
+			"if (result.catch) {\n",
+			"	result.catch(function(err) {\n",
+			"		error = err;\n",
+			"		var callbacks = onErrorCbs;\n",
+			"		onErrorCbs = null;\n",
+			"		for(var i = 0, l = callbacks.length; i < l; i++) {\n",
+			"			callbacks[i] && callbacks[i](error);\n",
+			"		}\n",
+            "	});\n",
+			"}\n",
+        ];
 	}
@@ -56,12 +74,16 @@ return result.join("");
 
-	var cbs = [],
+	var onSuccessCbs = [],
+	var onErroCbs = [],
 		data;
-	module.exports = function(cb) {
-		if(cbs) cbs.push(cb);
-		else cb(data);
+		error;
+	module.exports = function(onSuccessCb, onErrorCb) {
+		if(onSuccessCbs) onSuccessCbs.push(onSuccessCb);
+		else onSuccessCb(data);
+		if(onErrorCbs) onErrorCbs.push(onErrorCb);
+		else if (onErrorCb) onErrorCb(error);
 	}
-	require.ensure([], function(require) {
+	var result = require.ensure([], function(require) {
 		data = require("xxx");
-		var callbacks = cbs;
-		cbs = null;
+		var callbacks = onSuccessCbs;
+		onSuccessCbs = null;
 		for(var i = 0, l = callbacks.length; i < l; i++) {
@@ -71,3 +93,13 @@ callbacks[i](data);
 	});
+	if (result.catch) {
+		result.catch(function(err) {
+			error = err;
+			var callbacks = onErrorCbs;
+			onErrorCbs = null;
+			for(var i = 0, l = callbacks.length; i < l; i++) {
+				calbacks[i] && callbacks[i](error);
+			}
+		});
+	});
 
 */

package.json

 {
   "name": "bundle-marked-loader",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "authors": [
@@ -5,0 +5,0 @@ "Leonid Nikiforenko <[e-mail]>",

No alert changes

Improved metrics

Total package byte prevSize

136348

354.74%

Lines of code

98

48.48%

No dependency changes