mod-build 3.6.74-beta.2 → 3.6.74-beta.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.74-beta.3
+
+- Removed the newly added update-modalytics-path task and update grab-shared-scripts to consider isPathSubdirectory flag for modalytics script path
+
 ## 3.6.74-beta.2
 
 - Placed update-modalytics-path task just after grab-shared-scripts

package/gulp-tasks/build.js

@@ -20,11 +20,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			sequenceOpts.push('copy-fonts');
 		}
 
-		if (siteData.isPathSubdirectory) {
-			const index = sequenceOpts.indexOf('grab-shared-scripts');
-			sequenceOpts.splice(index + 1, 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/grab-shared-scripts.js

@@ -22,7 +22,8 @@ var pathSubdirectory = '';
 var componentFolderPath = '';
 
 function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
-  const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.src}}{{this.src}}{{/if}}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
+  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/';
   return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/head/head.html`)
     .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
     .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`));

package/gulp-tasks/tasks.js

@@ -465,18 +465,6 @@ 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/package.json

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

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

@@ -1,12 +0,0 @@
-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'));
-	};
-};