mod-build 4.0.0-beta.4 → 4.0.0-beta.4c

package/package.json

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

package/src/data/config.js

@@ -2,6 +2,7 @@ export const defaultSettings = {
 	tmpFolder: '.tmp', 
 	srcFolder: 'src',
 	distFolder: 'dist',
+	publicFolder: 'public',
 	fontsSubfolder: 'fonts',
 	imagesSubfolder: 'images', 
 	stylesSubfolder: 'styles',  

package/tasks/grab-form-helpers.js

@@ -17,7 +17,7 @@ const streamToDestination = (destPath, fileName) => {
 	const url = `https://${defaultSettings.nodeEnv}/${resourcePath}/${fileName}`;
 
 	return new Promise(resolve => {
-		const folderPath = `${defaultSettings.srcFolder}/${destPath}`;
+		const folderPath = `${defaultSettings.publicFolder}/${destPath}`;
 
 		if (!fs.existsSync(folderPath)) {
 			fs.mkdirSync(folderPath, { recursive: true });
@@ -86,7 +86,7 @@ export default async function() {
 	const destinationPath = '/resources/scripts/helpers/';
 	const filesPromiseMap = helpers.map(async helper => {
 		const fileName = helper;
-		if (fs.existsSync(`${defaultSettings.srcFolder}/${destinationPath}/${fileName}`)) {
+		if (fs.existsSync(`${defaultSettings.publicFolder}/${destinationPath}/${fileName}`)) {
 			return;
 		}
 		await streamToDestination(destinationPath, fileName);

package/tasks/grab-shared-scripts.js

@@ -160,12 +160,12 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 	return new Promise(resolve => {
 		const file = getFileFromURL(url);
 
-		if (!fs.existsSync(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}`)) {
-			fs.mkdirSync(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}`, { recursive: true });
+		if (!fs.existsSync(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}`)) {
+			fs.mkdirSync(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}`, { recursive: true });
 		}
 
 		// if file exists, do not create it again
-		if (fs.existsSync(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}/${file}`)) {
+		if (fs.existsSync(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file}`)) {
 			resolve();
 		} else {
 			const options = {
@@ -178,14 +178,14 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 					throw new Error(`${resp.status}: Error while fetching ${url}`);
 				}
 
-				const writer = createWriteStream(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}/${file}`);
+				const writer = createWriteStream(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file}`);
 				resp.data.pipe(writer);
-				console.log(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}/${file} created...`);
+				console.log(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file} created...`);
 				return finished(writer);
 			})
 			.then(() => {
 				return new Promise((resolve) => {
-					gulp.src(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}/${file}`)
+					gulp.src(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file}`)
 					.pipe(hash({
 						hashLength: 20,
 						algorithm: 'md5',
@@ -196,12 +196,9 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 						file = JSON.parse(file).history[1];
 						file = file.split('/').pop();
 						fileNames[task.config.fileName] = file;
-
-						console.log(file);
 					}))
-					.pipe(gulp.dest(`${task.config.defaultSettings.srcFolder}/resources/${config.dest}`))
+					.pipe(gulp.dest(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}`))
 					.on('finish', function(){
-						console.log('DONE HASHING');
 						resolve();
 					})
 				});
@@ -228,11 +225,8 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 
 export default async function(config) {
 	const { isLocal } = defaultSettings;
-	const isQuotePage = config.siteData?.isQuotePage || config.isQuotePage;
 	const useAccessibleComponents = config.useAccessibleConfig;
-	const useRelativePathForResources = config.siteData?.useRelativePathForResources || config.useRelativePathForResources;
 	componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
-	isQuotePageOrUseRelativePath = isQuotePage === true || useRelativePathForResources === true;
 	const isPathSubdirectory = config.siteData?.pathSubdirectory || config.pathSubdirectory;
 	pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
 

package/vite.config.js

@@ -6,6 +6,8 @@ import { defineConfig } from 'vite'
 import { startModBuild } from './tasks/serve.js'
 import { updateConfig } from './src/scripts/utils.js'
 import { viteStaticCopy } from 'vite-plugin-static-copy'
+import { glob } from 'glob'
+import fs from "node:fs";
 
 export default defineConfig((config) => ({
 	build: {
@@ -66,14 +68,22 @@ export default defineConfig((config) => ({
 		},
 		{
 			name: 'replace-src-paths',
-			transformIndexHtml: (html) => {
-				if (config.pathSubdirectory && config.pathSubdirectory.length > 0) {
-					return html
-						.replace(/(src|data-load)="\/?src\//g, `$1="${config.pathSubdirectory}`)
-						.replace(/(src|data-load|href)="\/?assets\//g, `$1="${config.pathSubdirectory}assets/`)
-						.replace(/(src|data-load|href)="\/?resources\//g, `$1="${config.pathSubdirectory}resources/`)
-				} else {
-					return html.replace(/(src|data-load)="\/?src\//g, '$1="/');
+			writeBundle: async () => {
+				const files = glob.sync(defaultSettings.distFolder + '/**/index.html');
+				for (const file of files) {
+					let html = await fs.promises.readFile(file, 'utf-8');
+					let updatedHtml = '';
+
+					if (config.pathSubdirectory && config.pathSubdirectory.length > 0) {
+						updatedHtml = html
+							.replace(/(src|data-load)="\/?src\//g, `$1="${config.pathSubdirectory}`)
+							.replace(/(src|data-load|href)="\/?assets\//g, `$1="${config.pathSubdirectory}assets/`)
+							.replace(/(src|data-load|href)="\/?resources\//g, `$1="${config.pathSubdirectory}resources/`)
+					} else {
+						updatedHtml = html.replace(/(src|data-load)="\/?src\//g, '$1="/');
+					}
+
+					await fs.promises.writeFile(file, updatedHtml);
 				}
 			},
 			apply: 'build',