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

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

@@ -3,28 +3,48 @@ var request = require('request');
 var source = require('vinyl-source-stream');
 var replace = require('gulp-replace');
 
+var images = [];
+
 function streamToDestination(gulp, siteSettings, url, fileName) {
+	var finalDestination;
+
+	if (!fs.existsSync(siteSettings.distFolder)) {
+		finalDestination = siteSettings.srcFolder;
+	} else {
+		finalDestination = siteSettings.distFolder;
+	}
+
 	return new Promise(resolve => { // eslint-disable-line no-undef
 		request(url)
 			.on('response', resp => {
 				if (resp.statusCode !== 200 && resp.statusCode !== 206) {
 					throw new Error(`${resp.statusCode} Error while fetching ${fileName}`);
 				} else {
-					replaceImgSrc(gulp, siteSettings, fileName);
+					images.push(fileName);
 				}
 			})
 			.pipe(source(fileName))
-			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/images/`))
+			.pipe(gulp.dest(`${finalDestination}/resources/images/`))
 			.on('finish', resolve);
 	});
 }
 
-function replaceImgSrc(gulp, siteSettings, fileName) {
-	const fileRegex = new RegExp(`(https?:\/\/.*${fileName})`, 'gm');
+function replaceImagePath(gulp, siteSettings) {
+  var finalDestination;
+  var stream = gulp.src(`${finalDestination}/index.html`);
 
-	return gulp.src(`${siteSettings.tmpFolder}/index.html`)
-		.pipe(replace(fileRegex, '/resources/images/' + fileName))
-		.pipe(gulp.dest('.'));
+	if (!fs.existsSync(siteSettings.distFolder)) {
+		finalDestination = siteSettings.tmpFolder;
+	} else {
+		finalDestination = siteSettings.distFolder;
+  }
+
+	if (images.length) {
+		images.forEach(function(image) {
+			stream = stream.pipe(replace(new RegExp(`"(?:(?!"|")[\\s\\S])+(${image})"`, 'gm'), '"/resources/images/' + image + '"'))
+		});
+	}
+	return stream.pipe(gulp.dest(finalDestination))
 }
 
 const getTags = (string) => {
@@ -67,16 +87,15 @@ const parseImageSources = (gulp, siteSettings) => {
 };
 
 module.exports = function(gulp, siteSettings, siteData) {
-	return function() {
-		const { isWhiteLabel } = siteData;
+	return async function() {
 		const urls = parseImageSources(gulp, siteSettings);
-		const ouputPath = isWhiteLabel ? 'images/' : 'temp/assets/images/';
-		const urlsPromises = urls.map((url) => {
-			const fileName = url.slice(url.lastIndexOf('/') + 1);
-			const relativePath = ouputPath + url.replace(fileName, '');
-			return streamToDestination(gulp, siteSettings, url, fileName, relativePath);
+		const urlsPromises = urls.map(async(url) => {
+			const fileName = await url.slice(url.lastIndexOf('/') + 1);
+			return await streamToDestination(gulp, siteSettings, url, fileName);
 		});
 
-		return Promise.all(urlsPromises); // eslint-disable-line no-undef
+		return await Promise.all(urlsPromises).then(function() {  // eslint-disable-line no-undef
+			replaceImagePath(gulp, siteSettings)
+		})
 	};
 };

package/gulp-tasks/serve.js

@@ -8,7 +8,7 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 		} else if (siteData.isQSPage) {
 			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images','grab-global-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server

package/package.json

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