mod-build 3.6.91-beta.7 → 3.6.91

package/.eslintrc.yml

@@ -1,49 +1,59 @@
 parserOptions:
-  ecmaVersion: 'latest'
+  ecmaVersion: 2018
   sourceType: 'module'
-
 env:
   browser: true
   jquery: true
-  node: true
-
-extends: 'eslint:recommended'
 
 globals:
   require: true
   module: true
 
-rules: {
-  brace-style: [2, '1tbs'],
-  camelcase: 2,
-  comma-dangle: [2, 'never'],
-  comma-style: [2, 'last'],
-  curly: [2, 'all'],
-  default-case: 2,
-  dot-notation: 2,
-  eqeqeq: [2, 'always', {'null': 'ignore'}],
-  guard-for-in: 2,
-  indent: [2, 'tab'],
-  key-spacing: [2, {beforeColon: false, afterColon: true, mode: 'minimum'}],
-  keyword-spacing: [2, { before: true, after: true }],
-  new-cap: 2,
-  no-console: 0,
-  no-floating-decimal: 2,
-  no-nested-ternary: 2,
-  no-new: 2,
-  no-shadow: 2,
-  no-use-before-define: 2,
-  operator-linebreak: [2, 'before', {overrides: {'?': 'after', ':': 'after'}}],
-  prefer-const: 2,
-  quotes: [2, 'single'],
-  semi: 2,
-  semi-spacing: 2,
-  space-before-blocks: [2, 'always'],
-  space-before-function-paren: [2, 'never'],
-  spaced-comment: [2, 'always', { exceptions: ['-']}],
-  space-infix-ops: 2,
-  space-in-parens: [2, 'never'],
-  strict: [2, 'never'],
-  valid-jsdoc: [1, { requireReturn: false, prefer: { return: "returns" }}],
+rules:
+  indent: [1, 'tab']
+  brace-style: [2, "1tbs"]
+  comma-style: [1, "last"]
+  default-case: 2
+  no-floating-decimal: 2
+  no-nested-ternary: 2
+  no-undefined: 2
+  space-before-function-paren: [1, "never"]
+  keyword-spacing: [2, {before: true, after: true}]
+  space-before-blocks: 1
+  spaced-comment: [2, "always", { exceptions: ["-"]}]
+  valid-jsdoc: [1, { requireReturn: false, prefer: { return: "returns" }}]
   wrap-iife: [2, "inside", { functionPrototypeMethods: true }]
-}
+  guard-for-in: 2
+  strict: [2, "never"]
+  camelcase: 1
+  curly: [2, "all"]
+  eqeqeq: [2, "allow-null"]
+  no-empty: 2
+  no-use-before-define: 2
+  no-obj-calls: 2
+  no-unused-vars: [1, {vars: "local", args: "after-used"}]
+  new-cap: 2
+  no-shadow: 1
+  no-invalid-regexp: 2
+  comma-dangle: [1, "never"]
+  no-undef: 2
+  no-new: 2
+  no-extra-semi: 2
+  no-debugger: 2
+  no-caller: 1
+  semi: 2
+  quotes: [1, "single", "avoid-escape"]
+  no-unreachable: 2
+  eol-last: 1
+  operator-linebreak: [1, "before", {overrides: {"?": "after", ":": "after"}}]
+  no-multi-str: 1
+  no-mixed-spaces-and-tabs: 1
+  no-trailing-spaces: 1
+  space-infix-ops: 1
+  space-unary-ops: 0
+  no-with: 2
+  dot-notation: 1
+  semi-spacing: 1
+  key-spacing: [1, {beforeColon: false, afterColon: true, mode: "minimum"}]
+  space-in-parens: [1, "never"]
+  prefer-const: 2

package/CHANGELOG.md

@@ -2,8 +2,7 @@
 
 ## 3.6.91
 
-- Updating `.eslintrc.yml` with our new lint rules; This configuration will also live on `quote.modernize.com`
-- Adding a new `add-editorconfig` task that will grab our global `editorconfig` file configuration & either add it to the project, or override the existing file contents
+- Added support for xml files
 
 ## 3.6.90
 

package/gulp-tasks/cache-bust.js

@@ -4,8 +4,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 		return gulp.src(siteSettings.distFolder + '/**')
 			.pipe(gulpPlugins.revAll.revision({
 				dontSearchFile: [/(resources)\/.*/, /(scripts\/components)\/.*/, /(fonts)\/.*/],
-				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/, /(fonts)\/.*/],
-				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/, /(fonts)\/.*/],
+				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/, /(fonts)\/.*/, '.xml'],
+				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/, /(fonts)\/.*/, '.xml'],
 				transformFilename: function (file, hash) {
 					var ext = path.extname(file.path);
 					return path.basename(file.path, ext) + '-' + hash.substr(0, 8) + ext;

package/gulp-tasks/copy-xml-files-to-dist.js

@@ -0,0 +1,7 @@
+// DO NOT REMOVE! It's being used at site level in the organic sites like MiamiHerald to copy sitemap file to destination folder.
+module.exports = function(gulp, siteSettings) {
+	return function() {
+		return gulp.src(siteSettings.tmpFolder + '/**/*.xml')
+			.pipe(gulp.dest(siteSettings.distFolder));
+	};
+};

package/gulp-tasks/extras.js

@@ -3,6 +3,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 
 	srcPaths.push(siteSettings.srcFolder + '/*.*');
 	srcPaths.push('!' + siteSettings.srcFolder + '/**/*.html');
+	srcPaths.push('!' + siteSettings.srcFolder + '/**/*.xml');
 
 	for (var i = 0; i < siteSettings.browserSyncServeFolders.length; i ++) {
 		srcPaths.push(siteSettings.browserSyncServeFolders[i] + '/**/*.otf');

package/gulp-tasks/js-lint.js

@@ -1,11 +1,10 @@
 module.exports = function(gulp, gulpPlugins, siteSettings) {
 	var fs = require('fs');
-	var gulpESLintNew = require('gulp-eslint-new');
 
 	// Default jsLint settings
 	if ('undefined' === typeof siteSettings.jsLint) {
 		siteSettings.jsLint = {
-			overrideConfigFile: './node_modules/mod-build/.eslintrc.yml'
+			configFile: './node_modules/mod-build/.eslintrc.yml'
 		};
 	}
 
@@ -18,9 +17,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 			'!' + siteSettings.srcFolder + '/' + siteSettings.scriptsSubfolder + '/resources/**/*.js', // do not lint copied shared resource scripts,
 			'!' + siteSettings.srcFolder + '/' + siteSettings.scriptsCompiledFolder + '**/*.js' // do not lint compiled scripts
 		])
-			.pipe(gulpESLintNew(siteSettings.jsLint))
-			.pipe(gulpESLintNew.format())
-			.pipe(gulpESLintNew.format('junit', fs.createWriteStream('eslint-results.xml')))
-			.pipe(gulpESLintNew.failAfterError());
+			.pipe(gulpPlugins.eslint(siteSettings.jsLint))
+			.pipe(gulpPlugins.eslint.format())
+			.pipe(gulpPlugins.eslint.format('junit', fs.createWriteStream('eslint-results.xml')));
 	};
 };

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', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else if (siteData.isQSPage) {
-			sequenceOpts = ['clean', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images','grab-global-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images','grab-global-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server

package/gulp-tasks/tasks.js

@@ -56,18 +56,6 @@ module.exports = function() {
 			}
 		},
 
-		// Grab global editorconfig file and add to project or override existing file contents
-		'add-editorconfig': {
-			subtasks: [],
-			func: function(opts) {
-				if ('undefined' === typeof opts.gulpTasksFolderPath) {
-					opts.gulpTasksFolderPath = '.';
-				}
-
-				return require(opts.gulpTasksFolderPath + '/add-editorconfig')(opts.gulp, opts.gulpSettings);
-			}
-		},
-
 		// Grab component files from CDN so they can be swapped into build
 		'grab-shared-components': {
 			subtasks: [],
@@ -477,6 +465,17 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/copy-fonts')(opts.gulp, opts.gulpSettings);
 			}
+		},
+
+		'copy-xml-files-to-dist': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				return require('./copy-xml-files-to-dist')(opts.gulp, opts.gulpSettings);
+			}
 		}
 	};
 

package/gulp-tasks/templates.js

@@ -287,6 +287,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		return new Promise(function(resolve) {
 			return gulp.src([
 				siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
+				siteSettings.srcFolder + '/' + '/**/*.xml',
 				'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
 			])
 				.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.91-beta.7",
+  "version": "3.6.91",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,7 +15,6 @@
     "bootstrap-sass": "^3.4.3",
     "browser-sync": "^2.18.6",
     "del": "^3.0.0",
-    "eslint": "^8.57.0",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.1",
     "gulp-babel": "^8.0.0",
@@ -25,7 +24,6 @@
     "gulp-cssmin": "^0.1.7",
     "gulp-csso": "^3.0.0",
     "gulp-eslint": "^5.0.0",
-    "gulp-eslint-new": "^2.1.0",
     "gulp-eslint-threshold": "^0.1.1",
     "gulp-filter": "^5.0.0",
     "gulp-handlebars-file-include": "^1.0.0",
@@ -68,8 +66,7 @@
     "webpack-stream": "^5.2.1"
   },
   "resolutions": {
-    "graceful-fs": "4.2.3",
-    "eslint": "8.57.0"
+    "graceful-fs": "4.2.3"
   },
   "husky": {
     "hooks": {
@@ -77,7 +74,6 @@
     }
   },
   "overrides": {
-    "graceful-fs": "^4.2.9",
-    "eslint": "8.57.0"
+    "graceful-fs": "^4.2.9"
   }
 }

package/gulp-tasks/add-editorconfig.js

@@ -1,22 +0,0 @@
-var request = require('request');
-var source = require('vinyl-source-stream');
-
-function addEditorConfig(gulp, siteSettings) {
-	return new Promise(resolve => {
-		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/configurations/editorconfig`)
-			.on('response', resp => {
-				if (resp.statusCode !== 200) {
-					throw new Error(`${resp.statusCode} Error while fetching editorconfig`);
-				}
-			})
-			.pipe(source('.editorconfig'))
-			.pipe(gulp.dest('./'))
-			.on('finish', resolve);
-	});
-}
-
-module.exports = function(gulp, siteSettings) {
-    return function() {
-        addEditorConfig(gulp, siteSettings);
-    }
-}