mod-build 3.5.1--beta.7 → 3.5.1--beta.8

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', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
 		} else if (siteData.isWhiteLabel) {
 			if (siteData.isQSPage) {
-				sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', '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', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', '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', 'build-stat'];
 			} else {
-				sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
 			}
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
 		}
 
 		runSequence(...sequenceOpts, function() {

package/gulp-tasks/grab-component-styles.js

@@ -0,0 +1,46 @@
+var request = require('request');
+var source = require('vinyl-source-stream');
+
+function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
+	return new Promise(resolve => { // eslint-disable-line no-undef
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site${inputPath}`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error('Error fetching about/privacy/terms modals');
+				}
+			})
+			.pipe(source(fileName))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/${destPath}`))
+			.on('finish', resolve);
+	});
+}
+
+module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
+	return function() {
+		const { nodeEnv, isLocal } = siteSettings;
+		const { isQSPage, isWhiteLabel, includeFaqLink, domain } = siteData;
+		const isModWhiteLabel = isWhiteLabel && !isQSPage
+		const domainHasModernize = domain.indexOf('modernize') > -1;
+
+		let externalResources;
+		// listing of Static Resources sub-path and site destination paths
+		// key: inputPath, value: destPath
+
+		externalResources = {
+			'/shared-components/carousel/styles.scss': ['/styles/shared-components/', 'carousel.scss']
+		};
+
+		if (!nodeEnv) {
+			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
+		}
+
+		const filesPromiseMap = Object.keys(externalResources).map(key => {
+			const destinationPath = externalResources[key][0];
+			const fileName = externalResources[key][1];
+			return streamToDestination(gulp, siteSettings, key, destinationPath, fileName);
+		});
+
+		// when Promise.all resolves, the streams are done and we can go to the next step
+		return Promise.all(filesPromiseMap); // eslint-disable-line no-undef
+	};
+};

package/gulp-tasks/serve.js

@@ -4,11 +4,11 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var runSequence = require('run-sequence');
 		var sequenceOpts;
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else if (siteData.isQSPage) {
-			sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-component-styles', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server

package/gulp-tasks/tasks.js

@@ -42,6 +42,20 @@ module.exports = function() {
 			}
 		},
 
+		// Grab component scss files from CDN so they can be swapped into build
+		'grab-component-styles': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				if (opts.siteData.useCDN) {
+					return require(opts.gulpTasksFolderPath + '/grab-component-styles')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
+				}
+			}
+		},
+
 		// Link scss files
 		'sass-lint': {
 			subtasks: [],

package/package.json

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