mod-build 3.6.64 → 3.6.65-beta.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.65
+
+- Removing the `'brand'` task (was working off `mod-site` dependencies which we are no longer using). Also removed the `useCDN` conditional for a few tasks (that I believe was added due to just copying/pasting).
+
 ## 3.6.64
 
 - Removing the massive amounts of console logs added in version `3.6.60`; I think the issue with our `grab-shared-scripts` task was that we are calling the `[replaceFooterStylesReference, replaceFooterStylesReferenceInMap]` twice. On the first go around, the QS footer styles are not yet loaded, & then once QS footer styles DID get loaded and we called the function a second time – it might have gotten hung up (we should only call these functions once).

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', 'add-path-subdirectories', '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', 'cache-bust', 'add-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', 'add-path-subdirectories', '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', 'copy-files-to-build-path', 'cache-bust', 'add-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', 'add-path-subdirectories', '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', 'cache-bust', 'add-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', 'add-path-subdirectories', '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', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		}
 
 		runSequence(...sequenceOpts, function() {

package/gulp-tasks/tasks.js

@@ -64,9 +64,7 @@ module.exports = function() {
 					opts.gulpTasksFolderPath = '.';
 				}
 
-				if (opts.siteData.useCDN) {
-					return require(opts.gulpTasksFolderPath + '/grab-shared-components')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
-				}
+				return require(opts.gulpTasksFolderPath + '/grab-shared-components')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 			}
 		},
 
@@ -78,9 +76,7 @@ module.exports = function() {
 					opts.gulpTasksFolderPath = '.';
 				}
 
-				if (opts.siteData.useCDN) {
-					return require(opts.gulpTasksFolderPath + '/grab-shared-scripts')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
-				}
+				return require(opts.gulpTasksFolderPath + '/grab-shared-scripts')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 			}
 		},
 
@@ -326,18 +322,6 @@ module.exports = function() {
 			}
 		},
 
-		// Brand mod-form on build
-		'brand': {
-			subtasks: [],
-			func: function(opts) {
-				if ('undefined' === typeof opts.gulpTasksFolderPath) {
-					opts.gulpTasksFolderPath = '.';
-				}
-
-				return require(opts.gulpTasksFolderPath + '/brand')(opts.gulp, opts.gulpSettings);
-			}
-		},
-
 		// Get images
 		'combine-files': {
 			subtasks: [],

package/package.json

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

package/gulp-tasks/brand.js

@@ -1,15 +0,0 @@
-var insert = require('gulp-insert');
-
-module.exports = function(gulp, siteSettings) {
-	return function() {
-		return gulp.src([siteSettings.distFolder + '/' + siteSettings.scriptsSubfolder + '/*.js'])
-			.pipe(insert.transform(function(contents) {
-				var packageJson = require('../package.json'),
-					version = packageJson.devDependencies && packageJson.devDependencies['mod-site'] ? packageJson.devDependencies['mod-site'] : 'Centralized',
-					comment = '/* Mod Site Version: ' + version + ' */ ';
-
-				return comment + contents;
-			}))
-			.pipe(gulp.dest(siteSettings.distFolder + '/' + siteSettings.scriptsSubfolder));
-	};
-};