mod-build 3.6.73-beta.3 → 3.6.74-beta.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.74-beta.1
+
+- Updating modalytics script path with a new task if isPathSubdirectory flag present in SiteData
+
+## 3.6.74
+
+- Updating the `add-path-subdirectories` task to update paths that also start with `accessible-components`
+
 ## 3.6.73
 
 - Updating `grab-shared-scripts` path to grab & replace the new, global `callrail.min.js` file

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

@@ -11,7 +11,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					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')) {
+					if (path.startsWith('src="images') || path.startsWith('src="scripts') || path.startsWith('src="shared-components') || path.startsWith('src="accessible-components')) {
 						return `src="${pathSubdirectory}${path.slice(5)}`;
 					}
 					return match;
@@ -23,7 +23,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					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')) {
+					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;

package/gulp-tasks/build.js

@@ -20,6 +20,11 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			sequenceOpts.push('copy-fonts');
 		}
 
+		if (siteData.isPathSubdirectory) {
+			const index = sequenceOpts.indexOf('grab-shared-scripts');
+			sequenceOpts.splice(index, 0, 'update-modalytics-path');
+		}
+
 		runSequence(...sequenceOpts, function() {
 			console.log('\x1b[42m%s\x1b[0m', '✔ Build completed!');
 			console.log('You can run \'gulp serve:dist\' to see production version.');

package/gulp-tasks/tasks.js

@@ -465,6 +465,18 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/copy-fonts')(opts.gulp, opts.gulpSettings);
 			}
+		},
+
+		// Update Modalytics Path
+		'update-modalytics-path': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				return require(opts.gulpTasksFolderPath + '/update-modalytics-path')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
+			}
 		}
 	};
 

package/gulp-tasks/update-modalytics-path.js

@@ -0,0 +1,12 @@
+var replace = require('gulp-replace');
+
+module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
+	const { isLocal } = siteSettings,
+		isPathSubdirectory = siteData.siteData && siteData.siteData.pathSubdirectory || siteData && siteData.pathSubdirectory,
+		pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
+	return function() {
+		return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
+			.pipe(replace(`${pathSubdirectory}{{#if this.src}}{{this.src}}{{/if}}resources/scripts/mod-alytics/`, `${pathSubdirectory}resources/scripts/mod-alytics/`))
+			.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
+	};
+};

package/package.json

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