mod-build 3.6.3--beta.4 → 3.6.3--beta.5

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', '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-shared-components', 'grab-shared-scripts', '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', 'grab-shared-components', '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-shared-components', 'grab-shared-scripts', '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', 'grab-shared-components', '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-shared-components', 'grab-shared-scripts', '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', 'grab-shared-components', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', '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-shared-scripts.js

@@ -1,7 +1,40 @@
-import fetch from "node-fetch";
+var request = require('request');
+var source = require('vinyl-source-stream');
+
+function copyCurrentModalytics(gulp, gulpPlugins, siteSettings) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/mod-alytics-version.txt`, function(err, resp, body) {
+			if (resp.statusCode !== 200) {
+				throw new Error(`${resp.statusCode}: Error while fetching mod-alytics-version.txt`);
+			}
+			var modalyticsVersion = body.split("/");
+			var file = modalyticsVersion[modalyticsVersion.length - 1];
+			resolve(file.replace(/\s+/g, ''));
+		})
+
+	})
+	.then((result) => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/${result}`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching ${result}`);
+					}
+				})
+				.pipe(source(result))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-alytics`))
+				.on('finish', resolve);
+		});
+	});
+}
 
 module.exports = function(gulp, gulpPlugins, siteSettings) {
 	return function() {
-		console.log('hiiii');
+		const { nodeEnv } = siteSettings;
+		if (!nodeEnv) {
+			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
+		}
+
+		return copyCurrentModalytics(gulp, gulpPlugins, siteSettings);
 	};
-};
+};

package/gulp-tasks/tasks.js

@@ -42,7 +42,7 @@ module.exports = function() {
 			}
 		},
 
-		// Grab component scss files from CDN so they can be swapped into build
+		// Grab component files from CDN so they can be swapped into build
 		'grab-shared-components': {
 			subtasks: [],
 			func: function(opts) {
@@ -56,6 +56,20 @@ module.exports = function() {
 			}
 		},
 
+		// Grab shared scripts from CDN so they can swapped into build
+		'grab-shared-scripts': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				if (opts.siteData.useCDN) {
+					return require(opts.gulpTasksFolderPath + '/grab-shared-scripts')(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.6.3--beta.4",
+  "version": "3.6.3--beta.5",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"