mod-build 4.0.0-alpha.20c → 4.0.0-alpha.20e

package/package.json

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

package/src/scripts/utils.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import { seasons } from "../data/seasons.js";
 import gulpHandlebarsFileInclude from "gulp-handlebars-file-include";
+import merge from "lodash.merge";
 
 export function getFileFromURL(url) {
 	return url.split('/').pop();
@@ -181,10 +182,7 @@ export const updateConfig = (config) => {
 						const configData = fs.readFileSync('src/.tmp/config.json', 'utf8');
 						const parsedConfig = JSON.parse(configData);
 
-						mergedConfig = {
-							...parsedConfig,
-							...mergedConfig,
-						};
+						mergedConfig = merge(mergedConfig, parsedConfig);
 
 						// overwrite the config file with new data
 						fs.writeFileSync('src/.tmp/config.json', JSON.stringify(mergedConfig, null, 2));
@@ -197,7 +195,7 @@ export const updateConfig = (config) => {
 		configureServer() {
 			gulpHandlebarsFileInclude(mergedConfig, { handlebarsHelpers, maxRecursion: 500 });
 		},
-		buildEnd() {
+		buildStart() {
 			gulpHandlebarsFileInclude(mergedConfig, { handlebarsHelpers, maxRecursion: 500 });
 		}
 	}

package/vite.config.js

@@ -5,9 +5,8 @@ import path from 'node:path'
 import { defaultSettings } from './src/data/config.js'
 import { defineConfig } from 'vite'
 import { startModBuild } from './tasks/serve.js'
-import { updateConfig, handlebarsHelpers } from './src/scripts/utils.js'
+import { updateConfig } from './src/scripts/utils.js'
 import { viteStaticCopy } from 'vite-plugin-static-copy'
-import gulpHandlebarsFileInclude from 'gulp-handlebars-file-include'
 
 export default defineConfig((config) => ({
 	build: {
@@ -54,10 +53,6 @@ export default defineConfig((config) => ({
 			}),
 			apply: 'serve',
 			enforce: 'post'
-		},
-		{
-			...gulpHandlebarsFileInclude({}, { handlebarsHelpers, maxRecursion: 500 }),
-			apply: 'build',
 		}
 	],
 	define: {