mod-build 4.0.0-alpha.1 → 4.0.0-alpha.10

package/gulp-tasks/add-path-subdirectories.js

@@ -11,7 +11,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					return `href="${pathSubdirectory}favicon.ico"`;
 				}))	
 				.pipe(replace(/((src=")(images|scripts|shared-components)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('src="images') || path.startsWith('src="scripts') || path.startsWith('src="shared-components')) {
+					if (path.startsWith('src="images') || path.startsWith('src="scripts') || path.startsWith('src="shared-components') || path.startsWith('src="accessible-components')) {
 						return `src="${pathSubdirectory}${path.slice(5)}`;
 					}
 					return match;
@@ -23,7 +23,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					return match;
 				}))
 				.pipe(replace(/((href=")(images|styles|shared-components)\/[^"]+")/g, function(match, path) {
-					if (path.startsWith('href="images') || path.startsWith('href="styles') || path.startsWith('href="shared-components')) {
+					if (path.startsWith('href="images') || path.startsWith('href="styles') || path.startsWith('href="shared-components') || path.startsWith('src="accessible-components')) {
 						return `href="${pathSubdirectory}${path.slice(6)}`;
 					}
 					return match;

package/gulp-tasks/grab-shared-scripts.js

@@ -13,7 +13,8 @@ const fileNames = {
   footerComponentJsFileName: '',
   modFooterStylesFileName: '',
   qsFooterStylesFileName: '',
-  homeownerFormFileName: ''
+  homeownerFormFileName: '',
+  callrailFileName: ''
 };
 var isQuotePageOrUseRelativePath = false;
 var resourceURL = '';
@@ -29,9 +30,11 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
   const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts` : '/resources/scripts';
   return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
-  .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
-      if (match.includes('mod-form/form')) {
+  .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(callrail.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
+    if (match.includes('mod-form/form')) {
         return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
+      } else if (match.includes('callrail')) {
+        return `"${resourcePath}/callrail/${fileNames.callrailFileName}"`;
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
@@ -140,6 +143,16 @@ function getResource(url, config = {}, fn, fnArray) {
   });
 }
 const TASKS = {
+  copyCallrail: {
+    url: 'shared-resources/scripts/callrail/callrail.min.js',
+    config: {
+      fileName: 'callrailFileName',
+      dest: 'scripts/callrail',
+      mapUrl: 'shared-resources/scripts/callrail/callrail.min.js.map',
+    },
+    srcReplaceFn: null,
+    additionalSrcReplaceFns: []
+  },
   copyModutils: {
     url: 'mod-utils/modutils.min.js',
     config: {

package/{src/main.js → main.js}

@@ -1,17 +1,19 @@
-import './styles/home.scss';
-import { templateData } from '../template.js';
-import { defaultSettings, siteData } from '../siteconfig.js';
+import './src/styles/home.scss';
+import { templateData } from './template.js';
+import { siteData } from './siteconfig.js';
+import { defaultSettings } from './src/data/config.js';
 
 const { page } = templateData();
-
+ 
 if (page.headConfig.useDynamicGtm || typeof window.isQSPage === 'undefined') {
-  import('./scripts/has-qs-params.js').then((qs) => {
+  import('./src/scripts/has-qs-params.js').then((qs) => {
 	qs.default();
 	window.gtm_container_ID = window.isQSPage ? siteData.qs_gtm_container_ID : siteData.gtm_container_ID;
   });
 }
-
+ 
 const { additionalAssets } = page.headConfig;
+
 if (additionalAssets) {
 	const { afterBegin, beforeEnd } = additionalAssets;
 
@@ -28,7 +30,7 @@ if (additionalAssets) {
 			const { type, src, isLocal, localSrc, useModCdn, defer, async } = asset;
 			if (type === 'script') {
 				const script = document.createElement(type);
-				script.src = (isLocal ? localSrc : (useModCdn ? `https://${defaultSettings.resourceDomain}/${src}` : src));
+				script.src = (isLocal ? localSrc : (useModCdn ? `https://${defaultSettings.nodeEnv}/${src}` : src));
 				script.async = async;
 				script.defer = defer;
 				document.head.appendChild(script);
@@ -37,9 +39,9 @@ if (additionalAssets) {
 			if (type === 'style') {
 				const link = document.createElement('link');
 				link.rel = 'stylesheet';
-				link.href = (isLocal ? localSrc : (useModCdn ? `https://${defaultSettings.resourceDomain}/${src}` : src));
+				link.href = (isLocal ? localSrc : (useModCdn ? `https://${defaultSettings.nodeEnv}/${src}` : src));
 				document.head.appendChild(link);
 			}
 		});
 	}	
-}
+}

package/package.json

@@ -1,31 +1,30 @@
 {
   "name": "mod-build",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.10",
   "description": "Share components for S3 sites.",
   "type": "module",
   "scripts": {
-    "dev": "export NODE_ENV=qa.modernize.com IS_LOCAL=true && vite",
-    "build": "vite build",
-    "preview": "vite preview"
+    "dev": "export NODE_ENV=modernize.com IS_LOCAL=true && vite",
+    "build": "export NODE_ENV=modernize.com && vite build",
+    "preview": "export NODE_ENV=modernize.com && vite preview"
   },
-  "devDependencies": {
+  "dependencies": {
     "@rollup/plugin-inject": "^5.0.5",
+    "@vituum/vite-plugin-handlebars": "^1.1.0",
+    "axios": "^1.6.2",
+    "del": "^7.1.0",
     "eslint": "^8.55.0",
     "gulp": "^4.0.2",
+    "gulp-handlebars-file-include": "^1.0.0",
     "gulp-hash": "^4.2.2",
+    "gulp-replace": "^1.1.4",
     "gulp-tap": "^2.0.0",
     "husky": "^8.0.3",
+    "lodash.merge": "^4.6.2",
     "sass": "^1.69.5",
     "vite": "^5.0.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-handlebars": "^1.6.0",
-    "vite-plugin-static-copy": "^1.0.0"
-  },
-  "dependencies": {
-    "axios": "^1.6.2",
-    "del": "^7.1.0",
-    "gulp-handlebars-file-include": "^1.0.0",
-    "gulp-replace": "^1.1.4",
-    "jquery": "^3.7.1"
+    "vite-plugin-static-copy": "^1.0.0",
+    "vituum": "^1.1.0"
   }
 }

package/public/images/logo.svg

@@ -0,0 +1,4 @@
+<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M74.94 27.036C74.628 27.504 74.2467 27.946 73.796 28.362C73.3627 28.778 72.8513 29.142 72.262 29.454C71.69 29.766 71.0487 30.0087 70.338 30.182C69.6447 30.3727 68.882 30.468 68.05 30.468C66.6633 30.468 65.3807 30.2253 64.202 29.74C63.0233 29.2547 62.0093 28.5873 61.16 27.738C60.3107 26.8713 59.6433 25.8487 59.158 24.67C58.69 23.4913 58.456 22.2 58.456 20.796C58.456 19.392 58.6987 18.1007 59.184 16.922C59.6693 15.7433 60.3367 14.7293 61.186 13.88C62.0527 13.0133 63.0667 12.3373 64.228 11.852C65.4067 11.3667 66.6807 11.124 68.05 11.124C68.726 11.124 69.3847 11.1933 70.026 11.332C70.6847 11.4707 71.3 11.67 71.872 11.93C72.444 12.1727 72.964 12.476 73.432 12.84C73.9 13.1867 74.29 13.5853 74.602 14.036L73.042 15.18C72.8513 14.8853 72.5913 14.5907 72.262 14.296C71.95 14.0013 71.5773 13.7413 71.144 13.516C70.7107 13.2907 70.234 13.1087 69.714 12.97C69.2113 12.8313 68.6653 12.762 68.076 12.762C66.88 12.762 65.8053 12.9787 64.852 13.412C63.916 13.8453 63.1187 14.4347 62.46 15.18C61.8013 15.908 61.2987 16.7573 60.952 17.728C60.6053 18.6987 60.432 19.7213 60.432 20.796C60.432 21.8707 60.6053 22.8933 60.952 23.864C61.316 24.8347 61.8273 25.6927 62.486 26.438C63.1447 27.166 63.942 27.7467 64.878 28.18C65.8313 28.6133 66.8973 28.83 68.076 28.83C69.1333 28.83 70.1387 28.6133 71.092 28.18C72.0453 27.7467 72.8427 27.0533 73.484 26.1L74.94 27.036ZM91.4242 23.058C91.4242 24.1153 91.2335 25.086 90.8522 25.97C90.4882 26.854 89.9769 27.6167 89.3182 28.258C88.6769 28.8993 87.9055 29.402 87.0042 29.766C86.1202 30.13 85.1582 30.312 84.1182 30.312C83.0782 30.312 82.1162 30.13 81.2322 29.766C80.3482 29.402 79.5769 28.8993 78.9182 28.258C78.2769 27.6167 77.7742 26.854 77.4102 25.97C77.0462 25.086 76.8642 24.1153 76.8642 23.058C76.8642 22.0007 77.0462 21.03 77.4102 20.146C77.7742 19.262 78.2769 18.508 78.9182 17.884C79.5769 17.2427 80.3482 16.7487 81.2322 16.402C82.1162 16.0553 83.0782 15.882 84.1182 15.882C85.1582 15.882 86.1202 16.0553 87.0042 16.402C87.9055 16.7487 88.6769 17.2427 89.3182 17.884C89.9769 18.508 90.4882 19.262 90.8522 20.146C91.2335 21.03 91.4242 22.0007 91.4242 23.058ZM89.4482 23.058C89.4482 22.2953 89.3182 21.576 89.0582 20.9C88.8155 20.224 88.4602 19.6347 87.9922 19.132C87.5415 18.612 86.9869 18.2047 86.3282 17.91C85.6695 17.6153 84.9329 17.468 84.1182 17.468C83.3035 17.468 82.5669 17.6153 81.9082 17.91C81.2669 18.2047 80.7122 18.612 80.2442 19.132C79.7935 19.6347 79.4469 20.224 79.2042 20.9C78.9615 21.576 78.8402 22.2953 78.8402 23.058C78.8402 23.8207 78.9615 24.5487 79.2042 25.242C79.4642 25.918 79.8195 26.516 80.2702 27.036C80.7209 27.5387 81.2669 27.9373 81.9082 28.232C82.5669 28.5267 83.3035 28.674 84.1182 28.674C84.9329 28.674 85.6695 28.5267 86.3282 28.232C86.9869 27.9373 87.5415 27.5387 87.9922 27.036C88.4602 26.516 88.8155 25.918 89.0582 25.242C89.3182 24.5487 89.4482 23.8207 89.4482 23.058ZM102.315 26.958H102.367L106.527 16.194H109.361V30H107.541V18.378H107.489L102.835 30H101.717L97.063 18.378H97.037V30H95.217V16.194H98.077L102.315 26.958ZM114.031 16.194H118.321C119.795 16.194 120.973 16.5407 121.857 17.234C122.741 17.91 123.183 18.924 123.183 20.276C123.183 20.952 123.053 21.55 122.793 22.07C122.551 22.5727 122.204 22.9973 121.753 23.344C121.32 23.6907 120.8 23.9507 120.193 24.124C119.587 24.2973 118.928 24.384 118.217 24.384H115.851V30H114.031V16.194ZM115.851 22.85H118.113C119.084 22.85 119.864 22.642 120.453 22.226C121.043 21.7927 121.337 21.1427 121.337 20.276C121.337 19.392 121.034 18.7593 120.427 18.378C119.838 17.9967 119.067 17.806 118.113 17.806H115.851V22.85ZM125.502 30H123.578L129.532 16.194H131.222L137.15 30H135.096L133.666 26.542H126.958L125.502 30ZM127.608 24.956H133.016L130.338 18.3L127.608 24.956ZM149.037 27.348H149.089V16.194H150.909V30H148.621L141.497 18.612H141.471V30H139.651V16.194H142.017L149.037 27.348ZM160.224 30H158.404V24.02L153.256 16.194H155.44L159.34 22.512L163.24 16.194H165.424L160.224 24.02V30ZM185.516 30L178.106 17.962H178.028L178.132 30H173.816V11.592H178.886L186.27 23.604H186.348L186.244 11.592H190.56V30H185.516ZM198.569 15.362H203.093L209.177 30H204.471L203.483 27.348H198.023L197.009 30H192.407L198.569 15.362ZM200.753 19.756L199.089 24.228H202.391L200.753 19.756ZM215.095 21.004H215.017L215.095 30H210.935V15.362H216.785L219.671 23.89H219.775L222.531 15.362H228.329V30H224.039L224.117 21.004H224.039L221.049 30H218.007L215.095 21.004ZM231.959 15.362H242.333V18.664H236.197V21.004H241.995V24.176H236.197V26.672H242.697V30H231.959V15.362Z" fill="#212021"/>
+<rect width="45" height="45" rx="22.5" fill="#DCDCDC"/>
+</svg>

package/siteconfig.js

@@ -1,38 +1,3 @@
-export let siteData = {
-	primary_trade: 'Medical Alerts',
-	service: 'alerts_medical', // required to fetch the correct tcpa blurb
-	gtm_container_ID: 'GTM-TBJV3H', // e.g. GTM-N23VMDW
-	qs_gtm_container_ID: 'GTM-TBJV3H',
-	email: 'support@emedicalalerts.com', // e.g.  // e.g. support@homesolarsurvey.com
-	email_unsub: 'unsubscribe@emedicalalerts.com', // e.g. unsubscribe@homesolarsurvey.com
-	domain: 'emedicalalerts.com', // e.g. homesolarsurvey.com
-	company_name: 'eMedicalAlerts', // e.g. Home Solar Survey
-	website_name: 'eMedicalAlerts.com', // e.g. HomeSolarSurvey.com
-	useCDN: true,
-	isWhiteLabel: true,  
-	isQSPage: true, 
-	useAccessibleConfig: true 
-};
- 
-export function setSiteData(newSiteData) {
-	siteData = newSiteData;
-} 
- 
-export const defaultSettings = {
-	tmpFolder: '.tmp', 
-	srcFolder: 'src',
-	browserSyncServeFolders: ['.tmp', 'src', 'node_modules/mod-style-bootstrap/src', 'node_modules/mod-base/src'],
-	distFolder: 'dist',
-	fontsSubfolder: 'fonts',
-	imagesSubfolder: 'images', 
-	stylesSubfolder: 'styles',  
-	scriptsSubfolder: 'scripts',
-	scriptsCompiledFolder: 'scripts/compiled',
-	templatesSubfolder: 'templates', 
-	dataSubfolder: 'data',  
-	modBuild: '',  
-	resourceDomain: process.env.IS_LOCAL ? 'qa.modernize.com' : 'modernize.com',
-	nodeEnv: process.env.NODE_ENV,
-	isLocal: process.env.IS_LOCAL || import.meta?.env?.DEV,
-	buildPath: process.env.BUILD_PATH
-}
+export const siteData = () => {
+	return {};
+};

package/src/data/config.js

@@ -0,0 +1,16 @@
+export const defaultSettings = {
+	tmpFolder: '.tmp', 
+	srcFolder: 'src',
+	distFolder: 'dist',
+	fontsSubfolder: 'fonts',
+	imagesSubfolder: 'images', 
+	stylesSubfolder: 'styles',  
+	scriptsSubfolder: 'scripts',
+	scriptsCompiledFolder: 'scripts/compiled',
+	templatesSubfolder: 'templates', 
+	dataSubfolder: 'data',  
+	modBuild: '',
+	nodeEnv: process.env.NODE_ENV,
+	isLocal: process.env.IS_LOCAL || import.meta?.env?.DEV,
+	buildPath: process.env.BUILD_PATH
+}

package/src/{index.html → pages/index.hbs}

@@ -4,15 +4,15 @@
     {{ fileInclude 'src/templates/components/head.html' 
       page = this
       path = 'home'
-    }}   
-  </head> 
+    }} 
+  </head>  
   <body>
+    {{ log this }}
     {{#header}}
-		{{ fileInclude 'src/accessible-components/header/header.html'
-			header = this
-		}}
-	{{/header}}
-    <h1>Hello</h1> 
+			{{ fileInclude 'src/accessible-components/header/header.html'
+        header = this
+      }}
+		{{/header}}
     <script type="module" src="/main.js"></script>
   </body>
 </html>

package/src/scripts/utils.js

@@ -1,5 +1,4 @@
 import { seasons } from "../data/seasons.js";
-import { defaultSettings } from "../../siteconfig.js";
 import gulpHandlebarsFileInclude from "gulp-handlebars-file-include";
 
 export function getFileFromURL(url) {
@@ -140,35 +139,26 @@ export const handlebarsHelpers = [
 		fn: function(obj) {
 			var output = '';
 			var ignoreKeys = Array.prototype.slice.call(arguments, 1, -1);
-
-			for (var key in obj.attributes) {
-				if (ignoreKeys.indexOf(key) === -1) {
-					if (typeof obj.attributes[key] !== 'object') {
-						output += key + '="' + obj.attributes[key] + '" ';
-					} else if (key === 'data') {
-						for (var dataKey in obj.attributes[key]) {
-							output += 'data-' + dataKey + '="' + obj.attributes[key][dataKey] + '" ';
-						}
-					} else if (key === 'aria') {
-						for (var ariaKey in obj.attributes[key]) {
-							output += 'aria-' + ariaKey + '="' + obj.attributes[key][ariaKey] + '" ';
-						}
-					} 
+			if (obj && typeof obj.attributes === 'object') {
+				for (var key in obj.attributes) {
+					if (ignoreKeys.indexOf(key) === -1) {
+						if (typeof obj.attributes[key] !== 'object') {
+							output += key + '="' + obj.attributes[key] + '" ';
+						} else if (key === 'data') {
+							for (var dataKey in obj.attributes[key]) {
+								output += 'data-' + dataKey + '="' + obj.attributes[key][dataKey] + '" ';
+							}
+						} else if (key === 'aria') {
+							for (var ariaKey in obj.attributes[key]) {
+								output += 'aria-' + ariaKey + '="' + obj.attributes[key][ariaKey] + '" ';
+							}
+						} 
+					}
 				}
 			}
 			return output.trim();
 		}
 	},
-	{
-		name: 'resolveAlias',
-		fn: function(input) {
-			if (input.includes('@')) {
-				const resolvedValue = defaultSettings.modBuild || '';
-				return input.replace('@', resolvedValue);
-			}
-			return input;
-		}
-	},
 	{
 		name: 'fileInclude',
 		fn: function(input) {

package/src/scripts/vendor/+.js

@@ -0,0 +1,5 @@
+import './google-tag-manager-head.js'
+import './heap-addeventproperties-identify.js'
+import './heap-tracking.js'
+import './heap-vwo.js'
+import './visual-website-optimizer.js'

package/src/styles/partials/+.css

@@ -0,0 +1,9 @@
+@import "_contact-us.scss";
+@import "_google-address-autocomplete.scss";
+@import "_mixins.scss";
+@import "_modal-pages.scss";
+@import "_modernize-colors.scss";
+@import "_qs-footer.scss";
+@import "_quote-footer-v1.scss";
+@import "_quote-footer-v2.scss";
+@import "_quote-footer-v3.scss";

package/src/templates/components/head.html

@@ -1,20 +1,16 @@
 <!-- an example of the head component for v4.0.0 -->
 <meta charset="UTF-8" />
-<link rel="icon" type="image/svg+xml" href="/{{#if page.headConfig.faviconPath}}{{page.headConfig.faviconPath}}{{else}}favicon.svg"{{/if}} />
+<link rel="icon" type="image/svg+xml" href="{{#if page.headConfig.faviconPath}}{{page.headConfig.faviconPath}}{{else}}favicon.svg"{{/if}} />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-<!-- assets links afterBegin -->
-{{#if page.headConfig.useModAnalytics}}
-	<script src="https://{{this.resourceDomain}}/quote/resources/mod-alytics/modalytics.min.js" {{#if page.headConfig.deferModAnalytics}}defer{{/if}} {{#if page.headConfig.asyncModAnalytics}}async{{/if}}></script>
+{{#if this.page.headConfig.useModAnalytics}}
+	<script src="https://{{this.page.nodeEnv}}/quote/resources/mod-alytics/modalytics.min.js" {{#if page.headConfig.deferModAnalytics}}defer{{/if}} {{#if page.headConfig.asyncModAnalytics}}async{{/if}}></script>
 {{/if}}
-
-<!-- Include vwo setup -->
-{{#xif "this.page.headConfig.vwoSetup.vwoPathArray.indexOf(this.path) > -1" }}
+{{#xif "this.page.headConfig.vwoSetup.vwoPathArray.includes(this.path)" }}
 	<link rel="preconnect" href="https://dev.visualwebsiteoptimizer.com">
-	<!-- Do not double hit our analytical resources (Heap/Google Analytics) if the page is going to be redirected by a VWO a/b test-->
-	<script src="{{ resolveAlias '@/scripts/vendor/visual-website-optimizer.js'}}"></script>
+	<script type="module" src="../scripts/vendor/visual-website-optimizer.js"></script>
 {{else}}
-	<script src="{{ resolveAlias '@/scripts/url-cleaner.js'}}"></script>
+	<script type="module" src="../scripts/url-cleaner.js'"></script>
 {{/xif}}
 
 {{#unless page.headConfig.disableRobots}}
@@ -48,13 +44,13 @@
 
 <!-- site title -->
 <title>
-	{{#if page.headConfig.inverseTitle}}
+	{{#if this.headConfig.inverseTitle}}
 		{{#unless page.headConfig.hideTitleCompanyName}}{{company_name}} | {{/unless}}
 		{{#if this.pageTitle}}
 			{{this.pageTitle}}
 		{{else}}
 			{{#if page.headConfig.title}}
-				{{page.headConfig.title}} 
+				{{this.headConfig.title}} 
 			{{/if}}
 		{{/if}}
 	{{else}}

package/tasks/build.js

@@ -0,0 +1,13 @@
+import gulp from 'gulp';
+import grabSharedComponents from './grab-shared-components.js';
+import grabSharedScripts from './grab-shared-scripts.js';
+import clean from './clean.js';
+import grabCdn from './grab-cdn.js';
+import grabFormHelpers from './grab-form-helpers.js';
+import templates from './templates.js';
+
+export function done() {
+	console.log('build done');
+}
+
+export default gulp.series(clean, grabCdn, grabSharedComponents, grabSharedScripts, grabFormHelpers, templates, done);

package/tasks/clean.js

@@ -1,10 +1,9 @@
 import { deleteSync } from 'del';
-import { defaultSettings } from '../siteconfig';
+import { defaultSettings } from '../src/data/config.js';
 
 const clean = (done) => {
 	deleteSync([
-		`src/${defaultSettings.tmpFolder}/`,
-		`${defaultSettings.distFolder}/`
+		`src/${defaultSettings.tmpFolder}/`
 	]);
 	console.log('clean finished');
 	done();

package/tasks/grab-cdn.js

@@ -1,5 +1,4 @@
-import { defaultSettings, siteData } from '../siteconfig.js'
-import { templateData } from '../template.js';
+import { defaultSettings } from '../src/data/config.js';
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
@@ -8,7 +7,7 @@ import fs from 'node:fs';
 
 function streamToDestination(inputPath, destPath, fileName) {
 	const finished = promisify(stream.finished);
-	const url = `https://${defaultSettings.resourceDomain}${inputPath}`;
+	const url = `https://${defaultSettings.nodeEnv}${inputPath}`;
 
 	return new Promise(resolve => {
 		if (!fs.existsSync(`src/${destPath}`)) {
@@ -44,11 +43,10 @@ function streamToDestination(inputPath, destPath, fileName) {
 	}); 
 } 
 
-export default async function(done) {
+export default async function(config) {
 	const { nodeEnv, isLocal } = defaultSettings;
-	const { isQSPage, isWhiteLabel, domain } = siteData;
-	const { page } = templateData();
-	const { themeFile } = page;
+	const { isQSPage, isWhiteLabel, domain, page } = config;
+	const { themeFile, cssThemes } = page;
 	const isModWhiteLabel = isWhiteLabel && !isQSPage
 	const domainHasModernize = domain.indexOf('modernize') > -1;
 
@@ -75,13 +73,21 @@ export default async function(done) {
 		Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
 	}
 
+	if (cssThemes && cssThemes.length > 0) {
+		cssThemes.forEach(theme => {
+			const themeFileName = `_${theme}.scss`;
+			const themePath = `/quote/resources/shared-resources/styles/themes/${themeFileName}`;
+			Object.assign(externalResources, {[themePath]: ['/resources/styles/themes/', themeFileName]});
+		});
+	}
+
 	// local dev files
 	const remoteFilesForLocalDev = {
 		'/quote/resources/mod-site/scripts/vendor/maxmind-geoip2.js': ['/temp/scripts/', 'maxmind-geoip2.js']
 	};
 
 	// theme JSON
-	if (isQSPage) {
+	if (isQSPage && themeFile) {
 		Object.assign(externalResources, {
 			[`/quote/resources/data/themes/${themeFile}.json`]: ['/data/', 'theme.json']
 		});
@@ -103,5 +109,4 @@ export default async function(done) {
 	});
 
 	await Promise.all(filesPromiseMap);
-	done();
-};
+}

package/tasks/grab-form-helpers.js

@@ -1,4 +1,4 @@
-import { defaultSettings } from '../siteconfig.js'
+import { defaultSettings } from '../src/data/config.js';
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
@@ -14,7 +14,7 @@ const streamToDestination = (destPath, fileName) => {
 	}
 
 	const finished = promisify(stream.finished);
-	const url = `https://${defaultSettings.resourceDomain}/${resourcePath}/${fileName}`;
+	const url = `https://${defaultSettings.nodeEnv}/${resourcePath}/${fileName}`;
 
 	return new Promise(resolve => {
 		const folderPath = `${defaultSettings.srcFolder}/${destPath}`;
@@ -55,13 +55,13 @@ async function getHelpers() {
 	let helpers = [];
 	await new Promise(resolve => {
 		const options = {
-			url: `https://${defaultSettings.resourceDomain}/${resourcePath}/chunks.txt`,
+			url: `https://${defaultSettings.nodeEnv}/${resourcePath}/chunks.txt`,
 			method: 'get'
 		}
 
 		axios(options).then(resp => {
 			if (resp.status !== 200) {
-				throw new Error(`${resp.status}: Error while fetching ${url}`);
+				throw new Error(`${resp.status}: Error while fetching ${options.url}`);
 			}
 			helpers = resp.data.split('\n');
 			resolve();
@@ -76,7 +76,7 @@ async function getHelpers() {
 	return helpers;
 }
 
-export default async function(done) {
+export default async function() {
 	const { nodeEnv } = defaultSettings;
 	const helpers = await getHelpers(defaultSettings);
 
@@ -90,5 +90,4 @@ export default async function(done) {
 	});
 
 	await Promise.all(filesPromiseMap);
-	done();
 }

package/tasks/grab-shared-components.js

@@ -1,4 +1,4 @@
-import { defaultSettings, siteData } from '../siteconfig.js'
+import { defaultSettings } from '../src/data/config.js'
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
@@ -6,7 +6,6 @@ import { promisify } from 'node:util';
 import fs from 'node:fs';
 
 const resourcePath = 'quote/resources/mod-site';
-const componentFolders = ['accessible-components'];
 
 const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 	const finished = promisify(stream.finished);
@@ -15,10 +14,6 @@ const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 		const folderPath = `${defaultSettings.srcFolder}/${folder}`;
 		const componentFolderPath = fileName.split('/')[0];
 
-		if (!fs.existsSync(folderPath)) {
-			fs.mkdirSync(folderPath, { recursive: true });
-		}
-
 		if (!fs.existsSync(`${folderPath}/${componentFolderPath}`)) {
 			fs.mkdirSync(`${folderPath}/${componentFolderPath}`, { recursive: true });
 		}
@@ -29,14 +24,14 @@ const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 		} else {
 			const writer = createWriteStream(`${folderPath}/${fileName}`)
 			const options = {
-				url: `https://${defaultSettings.resourceDomain}/${resourcePath}/${folder}/${fileName}`,
+				url: `https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/${fileName}`,
 				method: 'get',
 				responseType: 'stream'
 			};
 
 			axios(options).then(resp => {
 				if (resp.status !== 200) {
-					throw new Error(`${resp.status}: Error while fetching ${url}`);
+					throw new Error(`${resp.status}: Error while fetching ${options.url}`);
 				}
 				console.log(`${folderPath}/${fileName} created...`);
 				resp.data.pipe(writer);
@@ -53,15 +48,20 @@ const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 
 const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 	return componentFolders.map(folder => {
+		const folderPath = `${defaultSettings.srcFolder}/${folder}`;
+		if (fs.existsSync(`${folderPath}/`)) {
+			return;
+		}
+	
 		return new Promise(resolve => {
-			axios.get(`https://${defaultSettings.resourceDomain}/${resourcePath}/${folder}/all.json`)
+			axios.get(`https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/all.json`)
 				.then(resp => {
 					if (resp.status !== 200) {
 						throw new Error(`${resp.status}: Error while fetching ${folder}/all.json`);
 					}
 					const listOfComponents = resp.data;
 					const componentPromises = listOfComponents.map(resource => {
-					 	return streamSharedCompsToDestination(defaultSettings, folder, `${resource}`);
+						return streamSharedCompsToDestination(defaultSettings, folder, `${resource}`);
 					});
 					
 					resolve(Promise.all(componentPromises));
@@ -74,8 +74,7 @@ const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 	});
 }
 
-export default function(done) {
-	console.log('running grab-shared-components');
+export default function(config) {
+	const componentFolders = config.useAccessibleConfig ? ['accessible-components'] : ['shared-components'];
 	getListOfSharedComponents(defaultSettings, componentFolders);
-	done();
 }