mod-build 3.6.30 → 3.6.31

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.31
+
+- `grab-global-images` task bug fixes.
+
 ## 3.6.30
 
 - Adding in the `copy-videos` gulp task needed for native landing pages.

package/gulp-tasks/grab-global-images.js

@@ -2,11 +2,22 @@ var fs = require('fs');
 var request = require('request');
 var source = require('vinyl-source-stream');
 var replace = require('gulp-replace');
+var path = require('path')
 
-var images = [];
+var imagePaths = [];
 
-function streamToDestination(gulp, siteSettings, url, fileName) {
-	var finalDestination;
+function getFilePathFromURL(url) {
+	let pathName = new URL(url).pathname;
+	pathName = pathName.substring(0, pathName.lastIndexOf('/'));
+	pathName = pathName.replace('/quote/resources/', '');
+
+	return pathName;
+}
+
+function streamToDestination(gulp, siteSettings, url) {
+	let finalDestination;
+	const fileName = path.basename(url);
+	const filePath = getFilePathFromURL(url);
 
 	if (!fs.existsSync(siteSettings.distFolder)) {
 		finalDestination = siteSettings.srcFolder;
@@ -20,29 +31,31 @@ function streamToDestination(gulp, siteSettings, url, fileName) {
 				if (resp.statusCode !== 200 && resp.statusCode !== 206) {
 					throw new Error(`${resp.statusCode} Error while fetching ${fileName}`);
 				} else {
-					images.push(fileName);
+					imagePaths.push(url);
 				}
 			})
 			.pipe(source(fileName))
-			.pipe(gulp.dest(`${finalDestination}/resources/images/`))
+			.pipe(gulp.dest(`${finalDestination}/resources/${filePath}`))
 			.on('finish', resolve);
 	});
 }
 
 function replaceImagePath(gulp, siteSettings) {
-  var finalDestination;
+	var finalDestination;
 
 	if (!fs.existsSync(siteSettings.distFolder)) {
 		finalDestination = siteSettings.tmpFolder;
 	} else {
 		finalDestination = siteSettings.distFolder;
-  }
+	}
 
-  var stream = gulp.src(`${finalDestination}/index.html`);
+	var stream = gulp.src(`${finalDestination}/index.html`);
 
-	if (images.length) {
-		images.forEach(function(image) {
-			stream = stream.pipe(replace(new RegExp(`"(?:(?!"|")[\\s\\S])+(\/${image})"`, 'gm'), '"/resources/images/' + image + '"'))
+	if (imagePaths.length) {
+		imagePaths.forEach(function(imagePath) {
+			const fileName = path.basename(imagePath);
+			const filePath = getFilePathFromURL(imagePath);
+			stream = stream.pipe(replace(new RegExp(`"${imagePath}"`, 'gm'), `"/resources/${filePath}/${fileName}"`))
 		});
 	}
 	return stream.pipe(gulp.dest(finalDestination))
@@ -90,9 +103,8 @@ const parseImageSources = (gulp, siteSettings) => {
 module.exports = function(gulp, siteSettings, siteData) {
 	return async function() {
 		const urls = parseImageSources(gulp, siteSettings);
-		const urlsPromises = urls.map(async(url) => {
-			const fileName = await url.slice(url.lastIndexOf('/') + 1);
-			return await streamToDestination(gulp, siteSettings, url, fileName);
+		const urlsPromises = urls.map(async (url) => {
+			return await streamToDestination(gulp, siteSettings, url);
 		});
 
 		return await Promise.all(urlsPromises).then(function() {  // eslint-disable-line no-undef

package/package.json

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