grunt-combohtml - npm Package Compare versions

Comparing version 0.1.42 to 0.1.43

package.json

 {
   "name": "grunt-combohtml",
   "description": "combine build html with ssi.",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "homepage": "https://github.com/jayli/grunt-combohtml",
@@ -6,0 +6,0 @@ "author": {

tasks/lib/url_combine.js

@@ -82,8 +82,17 @@ // 'use strict';
 	var source = [];
-	for (var i = 0; i < arr.length; i++) {
-		if (!arr[i].match(baseUrl)) {
-			continue;
+
+	var toReplacedPrefix = 'http://' + baseUrl + '/';
+	arr.forEach(function(jsPath, idx){
+		if(jsPath.indexOf('??') != -1) {
+			// 如果该 js 引用中已经包含 combo，需要先解开 combo
+			var subComboParsed = jsPath.split('??');
+			var prefix = subComboParsed[0].replace(toReplacedPrefix, '');
+			var subComboAssets = subComboParsed[1].split(',');
+			subComboAssets.forEach(function(subComboAsset){
+				source.push(path.join(prefix, subComboAsset));
+			});
+		} else {
+			source.push(jsPath.replace(toReplacedPrefix, ''));
 		}
-		source.push(arr[i].replace('http://' + baseUrl + '/', ''));
-	}
+	});
 	return (source.length > 0) ? ('http://' + baseUrl + '/??' + source.join(',')).replace('????', '??') : '';
@@ -90,0 +99,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

160039

increased by0.24%

Lines of code

4034

increased by0.2%

No dependency changes