mod-build 3.6.89-beta.1 → 3.6.89-beta.3

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.6.89
 
-- Updating `fetchTcpaFromSitegenie()` to no longer have any use-cases of QuinStreet as the company name; should be Modernize all the time.
+- Updated the `add-path-subdirectories` task to include path replacements for `../` or any variation of `../` in the attribute replacement values.
 
 ## 3.6.88
 

package/gulp-tasks/add-path-subdirectories.js

@@ -6,35 +6,25 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		if (isPathSubdirectory) {
 			const pathSubdirectory = isPathSubdirectory;
 
+			const replacePath = (match, path, attribute) => {
+				if (new RegExp(`^${attribute}="(\.\.\/)+`).test(path)) {
+					const subdirectoryLevels = (path.match(/\.\.\//g) || []).length;
+					const correctedPath = `${pathSubdirectory}${path.slice((attribute.length + 2) + 3 * subdirectoryLevels)}`;
+					return `${attribute}="${correctedPath}`;
+				} else {
+					return `${attribute}="${pathSubdirectory}${path.slice((attribute.length + 2))}`;
+				}
+			};
+
 			return gulp.src(siteSettings.distFolder + '/**/*.html')
 				.pipe(replace(/(href="favicon.ico")/g, function(match, path) {
 					return `href="${pathSubdirectory}favicon.ico"`;
 				}))
-				.pipe(replace(/((src=")(resources|images|scripts|videos|shared-components|accessible-components)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('src="resources') || path.startsWith('src="images') || path.startsWith('src="scripts') || path.startsWith('src="videos') || path.startsWith('src="shared-components') || path.startsWith('src="accessible-components')) {
-						return `src="${pathSubdirectory}${path.slice(5)}`;
-					}
-					return match;
-				}))
-				.pipe(replace(/((srcset="images)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('srcset="images')) {
-						return `srcset="${pathSubdirectory}${path.slice(8)}`;
-					}
-					return match;
-				}))
-				.pipe(replace(/((poster="images)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('poster="images')) {
-						return `poster="${pathSubdirectory}${path.slice(8)}`;
-					}
-					return match;
-				}))
-				.pipe(replace(/((href=")(images|styles|shared-components|accessible-components)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('href="images') || path.startsWith('href="styles') || path.startsWith('href="shared-components') || path.startsWith('src="accessible-components')) {
-						return `href="${pathSubdirectory}${path.slice(6)}`;
-					}
-					return match;
-				}))
+				.pipe(replace(/((src="(\.\.\/)*)(resources|images|scripts|videos|shared-components|accessible-components)\/[^"]+")/g, (match, path) => replacePath(match, path, 'src')))
+				.pipe(replace(/((srcset="(\.\.\/)*images)\/[^"]+")/g, (match, path) => replacePath(match, path, 'srcset')))
+				.pipe(replace(/((poster="(\.\.\/)*images)\/[^"]+")/g, (match, path) => replacePath(match, path, 'poster')))
+				.pipe(replace(/((href="(\.\.\/)*)(images|styles|shared-components|accessible-components)\/[^"]+")/g, (match, path) => replacePath(match, path, 'href')))
 				.pipe(gulp.dest(siteSettings.distFolder));
 		}
-	}
+	};
 };

package/gulp-tasks/grab-shared-scripts.js

@@ -24,13 +24,13 @@ var componentFolderPath = '';
 
 function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const doNotIncludeSrc = siteData.siteData && siteData.siteData.isPathSubdirectory || siteData && siteData.isPathSubdirectory;
-  const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}${doNotIncludeSrc ? '' : '{{#if this.src}}{{this.src}}{{/if}}'}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
+  const resourcePath = isQuotePageOrUseRelativePath ? `${doNotIncludeSrc ? '' : '{{#if this.src}}{{this.src}}{{/if}}'}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
   return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/head/head.html`)
     .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
     .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts` : '/resources/scripts';
+  const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
   return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
   .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(callrail.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
     if (match.includes('mod-form/form')) {
@@ -51,8 +51,8 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const includeAccessibleFolder = useAccessibleComponents ? 'accessible/' : '';
   const abandonmentJsRegex = useAccessibleComponents ? /"(?:(?!"|")[\s\S])+(abandonment\/accessible\/abandonment.*?)js"/ : /"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/;
-  const jsResourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}resources/scripts/abandonment/` : '/resources/scripts/abandonment/';
-  const cssResourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}resources/styles/components/abandonment/` : '/resources/styles/components/abandonment/';
+  const jsResourcePath = (isQuotePageOrUseRelativePath ? '' : '/') + 'resources/scripts/abandonment/';
+  const cssResourcePath = (isQuotePageOrUseRelativePath ? '' : '/') + 'resources/styles/components/abandonment/';
   return gulp.src(siteSettings.srcFolder + '/templates/abandonment/*.html')
     .pipe(replace(abandonmentJsRegex, `"${jsResourcePath}${includeAccessibleFolder}${fileNames.abandonmentJsFileName}"`))
     .pipe(replace(/"(?:(?!"|")[\s\S])+(components\/abandonment\/abandonment.*?)css"/, `"${cssResourcePath}${fileNames.abandonmentStylesFileName}"`))

package/gulp-tasks/templates.js

@@ -240,6 +240,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	var fetchTcpaFromSitegenie = async function() {
+		const company = templatesData.company_name;
 		const website = templatesData.website_name;
 		const c_level = templatesData.cLevel ? templatesData.cLevel : 'default';
 		const affiliateKey = templatesData.affiliateKey ? templatesData.affiliateKey : 0;
@@ -258,7 +259,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}
 				const responseJson = await JSON.parse(response);
-				let finalTCPA = await responseJson.tcpa.replace(/QuinStreet/g, 'Modernize');
+				let finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
 				const removeInlineStyleRegex = / style="[^"]*"/g;
 				finalTCPA = finalTCPA.replace(removeInlineStyleRegex, '');
 				templatesData.tcpaText = await finalTCPA;

package/package.json

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