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

package/gulp-tasks/build.js

@@ -5,15 +5,15 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var sequenceOpts;
 
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'copy-resources-to-dist', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'handle-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		} else if (siteData.isWhiteLabel) {
 			if (siteData.isQSPage) {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'handle-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
 			} else {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'handle-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
 			}
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'copy-resources-to-dist', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'handle-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		}
 
 		runSequence(...sequenceOpts, function() {

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

@@ -0,0 +1,26 @@
+var replace = require('gulp-replace');
+
+module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
+	return function() {
+		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(/((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 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 match;
+				}))
+				.pipe(gulp.dest(siteSettings.distFolder));
+		}
+	}
+};

package/gulp-tasks/tasks.js

@@ -360,7 +360,7 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/grab-images')(opts.gulp, opts.gulpSettings, opts.siteData);
 			}
-    },
+    	},
 
 		// Get global images
 		'grab-global-images': {
@@ -432,7 +432,7 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/grab-tooltips-json')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 			}
-    },
+    	},
 
 		// copy resources directory into dist
 		'copy-resources-to-dist': {
@@ -446,6 +446,18 @@ module.exports = function() {
 			}
 		},
 
+		// If siteData.pathSubdirectory exists...append the directory path to all of the existing relative URL paths
+		'handle-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);
+			}
+		},
+
 		// Create a build
 		'build': {
 			func: function(opts) {

package/package.json

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