mod-build 4.0.85 → 4.0.86

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.86
+
+- Passing interceptor id instead of callback to axios `eject`.
+
 ## 4.0.85
 
 - Updated regex in 'replace-img-src-with-data-src' task to only swap `src` with `data-src` if 'loading' is present in the class list.
@@ -133,7 +137,7 @@
 
 ## 4.0.52
 
-- Replacing spaces with '_' in primary trade value in default trade questions.
+- Replacing spaces with '\_' in primary trade value in default trade questions.
 - Fixed bug in the seasonal updates task.
 
 ## 4.0.51
@@ -186,13 +190,12 @@
 
 ## 4.0.39
 
-- Added the E-Sign Consent modal to be grabbed as part of the  `grab-cdn` task.
+- Added the E-Sign Consent modal to be grabbed as part of the `grab-cdn` task.
 
 ## 4.0.37
 
 - Updated `getConsentCaptureLanguage` to include the `profileId` version of the display name API.
-*Currently being used for Best Company branded form pages.*
-
+  _Currently being used for Best Company branded form pages._
 ## 4.0.36
 
 - Included an option for `service` to be appended to the `brandedIncludeServiceConsentCapture` for consent capture.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.85",
+	"version": "4.0.86",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {
@@ -32,4 +32,4 @@
 		"vite-plugin-stylelint": "^5.3.1",
 		"vituum": "^1.1.0"
 	}
-}
+}

package/src/scripts/retry-axios.js

@@ -1,7 +1,7 @@
 export const responseInterceptor = (instance) => {
 	let retryCount = 0; 
 
-	instance.interceptors.response.use(
+	const interceptorId = instance.interceptors.response.use(
 		(response) => {
 			return response;
 		},
@@ -18,4 +18,6 @@ export const responseInterceptor = (instance) => {
 			return Promise.reject(error);
 		}
 	);
+
+	return interceptorId;
 };

package/tasks/grab-b2b-data.js

@@ -7,7 +7,7 @@ import fs from 'node:fs';
 import { responseInterceptor } from '../src/scripts/retry-axios.js';
 
 const axiosInstance = axios.create();
-responseInterceptor(axiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
 
 function streamToDestination(inputPath, destPath, fileName) {
 	const finished = promisify(stream.finished);
@@ -54,7 +54,7 @@ function streamToDestination(inputPath, destPath, fileName) {
 			console.error(`Error fetching ${url}:`, error.message);
 			process.exit(1);
 		}).finally(() => {
-			axiosInstance.interceptors.response.eject(responseInterceptor);
+			axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 		});
 	});
 }

package/tasks/grab-cdn.js

@@ -8,7 +8,7 @@ import path from 'node:path';
 import { responseInterceptor } from '../src/scripts/retry-axios.js';
 
 const axiosInstance = axios.create();
-responseInterceptor(axiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
 
 async function duplicateHtmlFilestoHbs(externalResources) {
 	for (const inputPath in externalResources) {
@@ -61,7 +61,7 @@ function streamToDestination(inputPath, destPath, fileName) {
 				console.error(error);
 				process.exit(1);
 			}).finally(() => {
-				axiosInstance.interceptors.response.eject(responseInterceptor);
+				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	});

package/tasks/grab-form-helpers.js

@@ -9,8 +9,8 @@ import { responseInterceptor } from '../src/scripts/retry-axios.js';
 const resourcePath = 'quote/resources/mod-form/form';
 const axiosInstance = axios.create();
 const helpersAxiosInstance = axios.create();
-responseInterceptor(axiosInstance);
-responseInterceptor(helpersAxiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const helpersAxiosResponseInterceptor = responseInterceptor(helpersAxiosInstance);
 
 // helper to allow us to define an "end" event to multiple streams
 const streamToDestination = (destPath, fileName) => {
@@ -52,7 +52,7 @@ const streamToDestination = (destPath, fileName) => {
 				console.error(error);
 				process.exit(1);
 			}).finally(() => {
-				axiosInstance.interceptors.response.eject(responseInterceptor);
+				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	});
@@ -78,7 +78,7 @@ async function getHelpers() {
 			console.error(error);
 			resolve();
 		}).finally(() => {
-			helpersAxiosInstance.interceptors.response.eject(responseInterceptor);
+			helpersAxiosInstance.interceptors.response.eject(helpersAxiosResponseInterceptor);
 		});
 	});
 

package/tasks/grab-jsdoc.js

@@ -10,8 +10,8 @@ import addFilesToGitignore from './add-files-to-gitignore.js';
 const resourcePath = 'quote/resources/mod-form';
 const axiosInstance = axios.create();
 const jsdocAxiosInstance = axios.create();
-responseInterceptor(axiosInstance);
-responseInterceptor(jsdocAxiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const jsdocResponseInterceptor = responseInterceptor(jsdocAxiosInstance);
 
 // Helper to stream a JSDoc file to the destination directory
 const streamToDestination = async (filePath) => {
@@ -59,7 +59,7 @@ const streamToDestination = async (filePath) => {
 		console.error(error);
 		process.exit(1);
 	} finally {
-		axiosInstance.interceptors.response.eject(responseInterceptor);
+		axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 	}
 }
 
@@ -88,7 +88,7 @@ async function getJSDocFiles() {
 		console.error(error);
 		throw error;
 	} finally {
-		jsdocAxiosInstance.interceptors.response.eject(responseInterceptor);
+		jsdocAxiosInstance.interceptors.response.eject(jsdocResponseInterceptor);
 	}
 }
 
@@ -106,7 +106,7 @@ export default async function grabJSDoc() {
 	const files = await getJSDocFiles();
 	const filesPromiseMap = files.map(filePath => streamToDestination(filePath));
 	await Promise.all(filesPromiseMap);
-	
+
 	const gitignoreFiles = [
 		'jsdoc-types/',
 		'modform.jsdoc.js'

package/tasks/grab-shared-components.js

@@ -9,7 +9,7 @@ import { responseInterceptor } from '../src/scripts/retry-axios.js';
 const resourcePath = 'quote/resources/mod-site';
 
 const axiosInstance = axios.create();
-responseInterceptor(axiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
 
 const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 	const finished = promisify(stream.finished);
@@ -75,7 +75,7 @@ const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 					throw new Error(`Error while fetching ${folder}/all.json: ${err.message}`);
 				})
 				.finally(() => {
-					axiosInstance.interceptors.response.eject(responseInterceptor);
+					axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 				});
 		});
 	});

package/tasks/grab-shared-scripts.js

@@ -19,7 +19,7 @@ let pathSubdirectory = '';
 let useAccessibleComponents = false;
 
 const axiosInstance = axios.create();
-responseInterceptor(axiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
 
 function replaceHeadScripts(gulp, defaultSettings) {
 	const resourcePath = '/resources/scripts';
@@ -301,7 +301,7 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 				console.error('Error:', error);
 			})
 			.finally(() => {
-				axiosInstance.interceptors.response.eject(responseInterceptor);
+				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	})

package/tasks/templates.js

@@ -13,9 +13,9 @@ import addSeasonalchanges from './addSeasonalchanges.js';
 const axiosInstance = axios.create();
 const tcpaAxiosInstance = axios.create();
 const consentCaptureAxiosInstance = axios.create();
-responseInterceptor(axiosInstance);
-responseInterceptor(tcpaAxiosInstance);
-responseInterceptor(consentCaptureAxiosInstance);
+const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const tcpaAxiosResponseInterceptor = responseInterceptor(tcpaAxiosInstance);
+const consentCaptureAxiosResponseInterceptor = responseInterceptor(consentCaptureAxiosInstance);
 
 async function mergeDefaultFormFieldConfigOnSteps(defaultConfig, data, parentConfig) {
 	if (!data || typeof data !== 'object') {
@@ -87,7 +87,7 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 				console.error(error);
 				process.exit(1);
 			}).finally(() => {
-				axiosInstance.interceptors.response.eject(responseInterceptor);
+				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 	});
 };
@@ -163,7 +163,7 @@ const fetchTcpaFromSitegenie = async (config, tempConfig, pathSubdirectory) => {
 				tempConfig.tcpaText = defaultTcpa.tcpaText;
 				resolve(error);
 			}).finally(() => {
-				tcpaAxiosInstance.interceptors.response.eject(responseInterceptor);
+				tcpaAxiosInstance.interceptors.response.eject(tcpaAxiosResponseInterceptor);
 			});
 	});
 };
@@ -264,7 +264,7 @@ const getConsentCaptureLanguage = async function(config, tempConfig) {
 				console.error(error);
 				process.exit(1);
 			}).finally(() => {
-				consentCaptureAxiosInstance.interceptors.response.eject(responseInterceptor);
+				consentCaptureAxiosInstance.interceptors.response.eject(consentCaptureAxiosResponseInterceptor);
 			});
 	});
 };