@epublishing/grunt-epublishing 0.3.22 → 0.3.23

package/lib/configure-webpack.js

@@ -53,7 +53,7 @@ module.exports = function configureWebpack(grunt, config) {
     if (!config.babelLoader) {
       config.babelLoader = {
         exceptions: [],
-        exclude: /(node_modules|bower_components)/,
+        exclude: /(node_modules)/,
       };
     }
 
@@ -144,7 +144,7 @@ module.exports = function configureWebpack(grunt, config) {
       rules.push({
         enforce: "pre",
         test: /\.js$/,
-        exclude: /(node_modules|bower_components|public|vendor)/,
+        exclude: /(node_modules|public|vendor)/,
         loader: "eslint-loader",
         options: {
           configFile: eslintConfig,

package/lib/init-jade-config.js

@@ -69,11 +69,6 @@ module.exports = function initJadeConfig(grunt, jadePath, jadeChildPath, jadeChi
   // Add package.json to the grunt config
   grunt.config.set('pkg', grunt.file.readJSON('package.json'));
 
-  // Check to see if we need to add the bower tasks
-  if (fs.existsSync('bower.json')) {
-    jadeTasks.unshift('bower-install-simple', 'bower');
-  }
-
   // Register the main jade task!
   grunt.registerTask('jade', jadeTasks);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epublishing/grunt-epublishing",
   "description": "Automated front-end tasks for ePublishing Jade and client sites.",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {
@@ -23,17 +23,12 @@
     "node": ">= 16.20.2"
   },
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-react-jsx": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
-    "@epublishing/babel-preset-epublishing": "^0.2.0",
+    "@epublishing/babel-preset-epublishing": "^0.1.8",
     "@epublishing/get-gem-paths": "^0.1.1",
     "@epublishing/grunt-install-eslint": "^0.1.1",
     "@epublishing/jade-resolver": "^0.1.2",
     "async": "^2.6.1",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^7.1.5",
     "babel-minify-webpack-plugin": "^0.3.0",
     "babel-plugin-transform-react-jsx": "^6.24.1",
     "bourbon": "^7.3.0",
@@ -59,8 +54,6 @@
     "grunt": "^1.0.3",
     "grunt-babel": "^7.0.0",
     "grunt-bless": "^1.0.2",
-    "grunt-bower": "^0.21.4",
-    "grunt-bower-install-simple": "^1.2.6",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-uglify": "^3.4.0",

package/tasks/jade.js

@@ -1,21 +1,5 @@
 /* eslint-disable no-console */
 
-if (typeof globalThis === 'undefined') {
-  (function() {
-    if (typeof self !== 'undefined') { self.globalThis = self; }
-    else if (typeof window !== 'undefined') { window.globalThis = window; }
-    else if (typeof global !== 'undefined') { global.globalThis = global; }
-    else {
-      Object.defineProperty(Object.prototype, 'globalThis', {
-        get: function() {
-          return this;
-        },
-        configurable: true
-      });
-    }
-  })();
-}
-
 'use strict';
 
 const path           = require('path');

package/tasks/npm-install.js

@@ -45,7 +45,7 @@ module.exports = function(grunt) {
 
         grunt.util.spawn({
           cmd: 'npm',
-          args: [ 'ci', '--legacy-peer-deps' ],
+          args: [ 'ci' ],
         }, (err, result) => {
           if (err) {
             grunt.fail.warn(err);

package/tasks/sass.js

@@ -2,37 +2,152 @@
 const util = require('util');
 const sass = require('sass');
 const path = require('path');
+const fs = require('fs');
+const fsPromises = require('fs').promises;
+const crypto = require('crypto');
 
 module.exports = grunt => {
-	grunt.registerMultiTask('sass', 'Compile Sass to CSS', function () {
+	// Cache for compiled results
+	const cache = new Map();
+	
+	// Generate cache key for a file
+	const getCacheKey = (filePath, options) => {
+		const content = fs.readFileSync(filePath, 'utf8');
+		const optionsHash = crypto.createHash('md5').update(JSON.stringify(options)).digest('hex');
+		const contentHash = crypto.createHash('md5').update(content).digest('hex');
+		return `${filePath}:${contentHash}:${optionsHash}`;
+	};
+
+	// Check if file needs recompilation
+	const needsRecompilation = async (src, dest, options) => {
+		try {
+			const cacheKey = getCacheKey(src, options);
+			const cached = cache.get(cacheKey);
+			
+			if (!cached) return true;
+			
+			// Check if destination file exists and is newer than source
+			const srcStats = await fsPromises.stat(src);
+			const destStats = await fsPromises.stat(dest);
+			
+			return srcStats.mtime > destStats.mtime;
+		} catch (error) {
+			// If destination doesn't exist or other error, recompile
+			return true;
+		}
+	};
+
+	grunt.registerMultiTask('sass', 'Compile Sass to CSS with performance optimizations', function () {
 		const done = this.async();
+		const startTime = Date.now();
 
 		const options = this.options({
-			precision: 10
+			precision: 10,
+			cache: true,
+			parallel: true,
+			maxConcurrency: require('os').cpus().length
 		});
 
-		(async () => {
-			await Promise.all(this.files.map(async item => {
+		// Filter out partial files and create compilation tasks
+		const compilationTasks = this.files
+			.map(item => {
 				const [src] = item.src;
-
 				if (!src || path.basename(src)[0] === '_') {
+					return null;
+				}
+				return { src, dest: item.dest, options };
+			})
+			.filter(Boolean);
+
+		if (compilationTasks.length === 0) {
+			grunt.log.writeln('No Sass files to compile');
+			done();
+			return;
+		}
+
+		// Process files with concurrency control
+		const processFile = async (task) => {
+			const { src, dest, options: taskOptions } = task;
+			
+			try {
+				// Check if recompilation is needed
+				if (options.cache && !(await needsRecompilation(src, dest, taskOptions))) {
+					grunt.log.debug(`Skipping ${src} (cached)`);
 					return;
 				}
 
-				const result = await util.promisify(sass.render)(Object.assign({}, options, {
+				// Compile Sass
+				const sassOptions = {
+					...taskOptions,
 					file: src,
-					outFile: item.dest,
-				}));
+					outFile: dest,
+				};
+
+				const result = await util.promisify(sass.render)(sassOptions);
+				
+				// Write CSS file
+				await fsPromises.writeFile(dest, result.css);
+				
+				// Write source map if requested
+				if (taskOptions.sourceMap) {
+					const mapPath = taskOptions.sourceMap === true ? `${dest}.map` : taskOptions.sourceMap;
+					await fsPromises.writeFile(mapPath, result.map);
+				}
+
+				// Cache the result
+				if (options.cache) {
+					const cacheKey = getCacheKey(src, taskOptions);
+					cache.set(cacheKey, {
+						css: result.css,
+						map: result.map,
+						timestamp: Date.now()
+					});
+				}
+
+				grunt.log.ok(`Compiled ${src} → ${dest}`);
+			} catch (error) {
+				grunt.log.error(`Error compiling ${src}: ${error.message}`);
+				throw error;
+			}
+		};
 
-				grunt.file.write(item.dest, result.css);
+		// Process files with controlled concurrency
+		const processWithConcurrency = async (tasks, maxConcurrency) => {
+			const results = [];
+			const chunks = [];
+			
+			// Split tasks into chunks
+			for (let i = 0; i < tasks.length; i += maxConcurrency) {
+				chunks.push(tasks.slice(i, i + maxConcurrency));
+			}
 
-				if (options.sourceMap) {
-					const filePath = options.sourceMap === true ? `${item.dest}.map` : options.sourceMap;
-					grunt.file.write(filePath, result.map);
+			// Process chunks sequentially, but files within each chunk in parallel
+			for (const chunk of chunks) {
+				const chunkResults = await Promise.all(chunk.map(processFile));
+				results.push(...chunkResults);
+			}
+
+			return results;
+		};
+
+		// Main execution
+		(async () => {
+			try {
+				if (options.parallel) {
+					await processWithConcurrency(compilationTasks, options.maxConcurrency);
+				} else {
+					// Sequential processing for debugging or when parallel is disabled
+					for (const task of compilationTasks) {
+						await processFile(task);
+					}
 				}
-			}));
-		})().catch(error => {
-			grunt.fatal(error.formatted || error);
-		}).then(done);
+
+				const duration = Date.now() - startTime;
+				grunt.log.ok(`Sass compilation completed in ${duration}ms`);
+				done();
+			} catch (error) {
+				grunt.fatal(error.formatted || error.message);
+			}
+		})();
 	});
 };

package/node-upgrade.md

@@ -1,368 +0,0 @@
-# Node.js v8 to v16 Server Upgrade Strategy
-
-## Overview
-
-This document outlines a phased approach for upgrading Node.js directly from version 8 to version 16 across our server infrastructure, with rollback procedures at each step.
-
-## Server Deployment Overview
-
-## Staging Servers
-
-### rails-stage-app-10.cloud.epub.net
-
-- arwarchitect
-- bevindustry
-- bioworld
-- creditunionmagazine
-- foodengineeringmag
-- halldale
-- packagingstrategies
-- remediation-technology
-- roofingsupplypro
-- rtoinsder
-- supplychainquarterly
-
-### rails-stage-app-11.cloud.epub.net
-
-- adhesivesmag
-- agproud
-- assemblymag
-- cannabisproductsinsider
-- centerwatch
-- dairyfoods
-- dairyprocessing
-- demoepub
-- demoepub_docker_image
-- discoverconcordma
-- esmagazine
-- farm-equipment
-- fdanews
-- thecarlatreport
-- thescxchange
-- wholefoodsmagazine
-
-### continuum-stage-app-6.epublishing.internal
-
-- agequipmentintelligence
-- alpha
-- bakemag
-- beverage-digest
-- bnpevents
-- businesswatchnetwork
-- continuum
-- covercropstrategies
-- foodbusinessnews
-- insidemortgagefinance
-- logisticsdevelopmentforum
-- meatpoultry
-- newsletterclarivate
-- petfoodprocessing
-- supermarketperimeter
-- supplychainbrain
-- worldgrain
-
-### continuum-stage-app-5.epublishing.internal
-
-- agri-pulse
-- architecturalrecord
-- enr
-- graphql_api
-- metaservices
-- qualitymag
-- roofingcontractor
-- safetyandhealthmagazine
-- spokanejournal
-- stoneworld
-- thehabitatgroup
-- thesunmagazine
-
-### rails-stage-app-8.cloud.epub.net
-
-- achrnews
-- americanfarriers
-- foodmaster
-- geartechnology
-- ishn
-- pcimag
-- pmengineer
-- pmmag
-- powertransmission
-- precisionfarmingdealer
-- preparedfoods
-- provisioneronline
-- rurallifestyledealer
-- securitymagazine
-- striptillfarmer
-- wconline
-
-### rails-stage-app-9.cloud.epub.net
-
-- bakingbusiness
-- food-safety
-- missioncriticalmagazine
-- mwjournal
-- phcppros
-- randrmagonline
-- refrigeratedfrozenfood
-- sdmmag
-- signalintegrityjournal
-- snackandbakery
-- supplyht
-- thedriller
-- tricitiesbusinessnews
-
-## Production Servers
-
-### bnp-app-11.cloud.epub.net
-
-- achrnews
-- adhesivesmag
-- arwarchitect
-- bevindustry
-- dairyfoods
-- esmagazine
-- food-safety
-- missioncriticalmagazine
-- pcimag
-- pmengineer
-- thedriller
-
-### bnp-app-12.cloud.epub.net
-
-- achrnews
-- adhesivesmag
-- arwarchitect
-- bevindustry
-- dairyfoods
-- esmagazine
-- food-safety
-- missioncriticalmagazine
-- pcimag
-- pmengineer
-- thedriller
-
-### bnp-app-13.cloud.epub.net
-
-- achrnews
-- assemblymag
-- bnpevents
-- cannabisproductsinsider
-- enr
-- foodmaster
-- preparedfoods
-- provisioneronline
-- randrmagonline
-- refrigeratedfrozenfood
-- remediation-technology
-- sdmmag
-- snackandbakery
-- supplyht
-- wconline
-
-### bnp-app-14.cloud.epub.net
-
-- achrnews
-- assemblymag
-- bnpevents
-- cannabisproductsinsider
-- enr
-- foodmaster
-- preparedfoods
-- provisioneronline
-- randrmagonline
-- refrigeratedfrozenfood
-- remediation-technology
-- sdmmag
-- snackandbakery
-- supplyht
-- wconline
-
-### bnp-app-15.cloud.epub.net
-
-- achrnews
-- architecturalrecord
-- enr
-- foodengineeringmag
-- ishn
-- logisticsdevelopmentforum
-- packagingstrategies
-- pmmag
-- qualitymag
-- roofingcontractor
-- roofingsupplypro
-- securitymagazine
-- stoneworld
-
-### bnp-app-16.cloud.epub.net
-
-- achrnews
-- architecturalrecord
-- enr
-- foodengineeringmag
-- ishn
-- logisticsdevelopmentforum
-- packagingstrategies
-- pmmag
-- qualitymag
-- roofingcontractor
-- roofingsupplypro
-- securitymagazine
-- stoneworld
-
-### rails-app-101.cloud.epub.net
-
-- agequipmentintelligence
-- agri-pulse
-- americanfarriers
-- discoverconcordma
-- phcppros
-- thecarlatreport
-- thehabitatgroup
-- wholefoodsmagazine
-
-### rails-app-102.cloud.epub.net
-
-- agequipmentintelligence
-- agri-pulse
-- americanfarriers
-- discoverconcordma
-- phcppros
-- thecarlatreport
-- thehabitatgroup
-- wholefoodsmagazine
-
-### rails-app-103.cloud.epub.net
-
-- beverage-digest
-- centerwatch
-- covercropstrategies
-- farm-equipment
-- fdanews
-- halldale
-- newsletterclarivate
-- rtoinsder
-- rurallifestyledealer
-- signalintegrityjournal
-
-### rails-app-104.cloud.epub.net
-
-- beverage-digest
-- centerwatch
-- covercropstrategies
-- farm-equipment
-- fdanews
-- halldale
-- newsletterclarivate
-- rtoinsder
-- rurallifestyledealer
-- signalintegrityjournal
-
-### rails-app-105.cloud.epub.net
-
-- foodbusinessnews
-- hfmmagazine
-- mwjournal
-- no-tillfarmer
-- precisionfarmingdealer
-- safetyandhealthmagazine
-- striptillfarmer
-- supplychainbrain
-- supplychainquarterly
-- thescxchange
-
-### rails-app-106.cloud.epub.net
-
-- foodbusinessnews
-- hfmmagazine
-- mwjournal
-- no-tillfarmer
-- precisionfarmingdealer
-- safetyandhealthmagazine
-- striptillfarmer
-- supplychainbrain
-- supplychainquarterly
-- thescxchange
-
-### rails-app-107.cloud.epub.net
-
-- agproud
-- bakingbusiness
-- bioworld
-- geartechnology
-- powertransmission
-- spokanejournal
-- thesunmagazine
-- tricitiesbusinessnews
-
-### rails-app-108.cloud.epub.net
-
-- agproud
-- bakingbusiness
-- bioworld
-- geartechnology
-- powertransmission
-- spokanejournal
-- thesunmagazine
-- tricitiesbusinessnews
-
-### rails-internal-app-101.cloud.epub.net
-
-- metaservices
-
-### rails-internal-app-102.cloud.epub.net
-
-- metaservices
-
-## Pre-Upgrade Preparation
-
-1. Create full system backups of all servers
-2. Update package.json dependencies for v16 compatibility on all repositories in the rails/upgrade/master branch. This is already done for all jade sites.
-
-## Phase 1: Staging Environment Upgrade (v8 → v16)
-
-1. Upgrade all staging servers to Node.js 16
-2. Merge all jade sites' rails/upgrade/master branch into their respective repositories' staging branch.
-3. Update package.json dependencies for v16 compatibility (already done for all jade sites)
-4. Deploy staging branch to all staging servers
-5. Run test suite and fix any breaking changes
-
-### Rollback Plan Phase 1
-
-- Restore system backup
-- Revert staging branch to previous state
-- Reinstall Node.js v8
-- Verify system functionality
-
-**By upgrading staging servers first, we can thoroughly verify each site's functionality in a controlled environment without any impact to production traffic.** This critical staging phase significantly reduces downtime risks and provides a crucial safety net, allowing us to identify and resolve any compatibility issues before touching customer-facing systems. This approach is essential for maintaining system reliability throughout the upgrade process.
-
-
-## Phase 2: Production Environment Upgrade (v8 → v16)
-
-1. Select one production server for initial upgrade
-2. Upgrade selected server to Node.js 16
-3. Merge rails/upgrade/master branch into that server's repository's master branch
-4. Deploy master branch to selected server for all sites on that server
-5. Monitor performance metrics and error rates for 24 hours
-6. If stable, continue monitoring for 1 week
-7. Repeat steps 1-6 for each remaining production server
-
-### Rollback Plan Phase 2
-
-- Restore system backup
-- Revert master branch to previous state
-- Reinstall Node.js v8
-- Verify system functionality
-
-## Success Criteria
-
-- Zero downtime during transitions
-- Error rates remain at or below baseline
-- Response times within 10% of baseline
-- All automated tests passing
-- No customer-reported issues
-
-## Timeline
-
-- Phase 1: 2 weeks
-- Phase 2: 3 weeks
-- Total: 5 weeks