mod-build 3.6.44-beta.4 → 3.6.44-beta.6

package/gulp-tasks/{handle-path-subdirectories.js → add-path-subdirectories.js}

@@ -5,18 +5,19 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		if (siteData.siteData && siteData.siteData.pathSubdirectory || siteData && siteData.pathSubdirectory) {
 			const pathSubdirectory = siteData.siteData && siteData.siteData.pathSubdirectory || siteData && siteData.pathSubdirectory;
 
-			console.log(pathSubdirectory);
-
 			return gulp.src(siteSettings.distFolder + '/**/*.html')
+				.pipe(replace(/(href="favicon.ico")/g, function(match, path) {
+					return `href="${pathSubdirectory}favicon.ico"`;
+				}))	
 				.pipe(replace(/((src=")(images|scripts|shared-components)\/[^"]+")/g, function(match, path) {
 					if (path.startsWith('src="images') || path.startsWith('src="scripts') || path.startsWith('src="shared-components')) {
-						return 'src="/spn/' + path.slice(5);
+						return `src="${pathSubdirectory}${path.slice(5)}`;
 					}
 					return match;
 				}))
 				.pipe(replace(/((href=")(images|styles|shared-components)\/[^"]+")/g, function(match, path) {
 					if (path.startsWith('href="images') || path.startsWith('href="styles') || path.startsWith('href="shared-components')) {
-						return 'href="/spn/' + path.slice(6);
+						return `href="${pathSubdirectory}${path.slice(6)}`;
 					}
 					return match;
 				}))

package/gulp-tasks/tasks.js

@@ -446,15 +446,15 @@ module.exports = function() {
 			}
 		},
 
-		// If siteData.pathSubdirectory exists...append the directory path to all of the existing relative URL paths
-		'handle-path-subdirectories': {
+		// If siteData.pathSubdirectory exists...append the directory path to all of the existing RELATIVE URL paths
+		'add-path-subdirectories': {
 			subtasks: [],
 			func: function(opts) {
 				if ('undefined' === typeof opts.gulpTasksFolderPath) {
 					opts.gulpTasksFolderPath = '.';
 				}
 
-				return require(opts.gulpTasksFolderPath + '/handle-path-subdirectories')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
+				return require(opts.gulpTasksFolderPath + '/add-path-subdirectories')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 			}
 		},
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.44-beta.4",
+  "version": "3.6.44-beta.6",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",