mod-build 4.0.0-alpha.6 → 4.0.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "description": "Share components for S3 sites.",
   "type": "module",
   "scripts": {

package/tasks/grab-cdn.js

@@ -1,6 +1,4 @@
-import { siteData } from '../siteconfig.js'
 import { defaultSettings } from '../src/data/config.js';
-import { templateData } from '../template.js';
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
@@ -45,10 +43,9 @@ function streamToDestination(inputPath, destPath, fileName) {
 	}); 
 } 
 
-export default async function(done) {
+export default async function(config, done) {
 	const { nodeEnv, isLocal } = defaultSettings;
-	const { isQSPage, isWhiteLabel, domain } = siteData;
-	const { page } = templateData();
+	const { isQSPage, isWhiteLabel, domain, page } = config;
 	const { themeFile, cssThemes } = page;
 	const isModWhiteLabel = isWhiteLabel && !isQSPage
 	const domainHasModernize = domain.indexOf('modernize') > -1;

package/tasks/grab-shared-components.js

@@ -1,5 +1,4 @@
 import { defaultSettings } from '../src/data/config.js'
-import { siteData } from '../siteconfig.js';
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
@@ -7,7 +6,6 @@ import { promisify } from 'node:util';
 import fs from 'node:fs';
 
 const resourcePath = 'quote/resources/mod-site';
-const componentFolders = siteData.useAccessibleConfig ? ['accessible-components'] : ['shared-components'];
 
 const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 	const finished = promisify(stream.finished);
@@ -71,7 +69,8 @@ const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 	});
 }
 
-export default function(done) {
+export default function(config, done) {
+	const componentFolders = config.useAccessibleConfig ? ['accessible-components'] : ['shared-components'];
 	console.log('running grab-shared-components');
 	getListOfSharedComponents(defaultSettings, componentFolders);
 	done();

package/tasks/grab-shared-scripts.js

@@ -1,4 +1,3 @@
-import { siteData } from '../siteconfig.js'
 import { defaultSettings } from '../src/data/config.js';
 import axios from 'axios';
 import { createWriteStream } from 'node:fs';
@@ -238,14 +237,14 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 	})
 }
 
-export default async function(done) {
+export default async function(config, done) {
 	const { isLocal } = defaultSettings;
-	const isQuotePage = siteData?.siteData?.isQuotePage || siteData?.isQuotePage;
-	const useAccessibleComponents = siteData?.siteData?.useAccessibleConfig || siteData?.useAccessibleConfig;
-	const useRelativePathForResources = siteData?.siteData?.useRelativePathForResources || siteData?.useRelativePathForResources;
+	const isQuotePage = config.siteData?.isQuotePage || config.isQuotePage;
+	const useAccessibleComponents = config.siteData?.useAccessibleConfig || config.useAccessibleConfig;
+	const useRelativePathForResources = config.siteData?.useRelativePathForResources || config.useRelativePathForResources;
 	componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
 	isQuotePageOrUseRelativePath = isQuotePage === true || useRelativePathForResources === true;
-	const isPathSubdirectory = siteData?.siteData?.pathSubdirectory || siteData?.pathSubdirectory;
+	const isPathSubdirectory = config.siteData?.pathSubdirectory || config.pathSubdirectory;
 	pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
 
 	const tasks = Object.values(TASKS);
@@ -257,7 +256,7 @@ export default async function(done) {
 					task.config.mapUrl = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js.map';
 				}
 			}
-			Object.assign(task.config, { defaultSettings, siteData });
+			Object.assign(task.config, { defaultSettings, config });
 			await getResource(task, fileNames);
 		});
 

package/tasks/serve.js

@@ -10,4 +10,6 @@ export function done() {
 	console.log('done');
 }
 
-export default gulp.series(clean, grabCdn, grabSharedComponents, grabSharedScripts, grabFormHelpers, templates, done);
+export default function(config) {
+	return gulp.series(clean, () => grabCdn(config), () => grabSharedComponents(config), () => grabSharedScripts(config), () => grabFormHelpers(config), () => templates(config), done);
+}