diff --git a/aleksis/core/vite.config.js b/aleksis/core/vite.config.js index bb332b3d8e728201ac9a936cd86c813ff7aeeb54..c90f833febbfd3c32c5f85cacdbe67c218ec4c5b 100644 --- a/aleksis/core/vite.config.js +++ b/aleksis/core/vite.config.js @@ -13,7 +13,8 @@ const django_values = JSON.parse(fs.readFileSync("./django-vite-values.json")); function generateAppImporter(appDetails) { let code = "let appObjects = {};\n"; - let code += "let appMessages = {};\n"; + code += "let appMessages = {};\n"; + for (const [appPackage, appMeta] of Object.entries(appDetails)) { let indexPath = appMeta.assetDir + "/index.js"; let importAppName = @@ -22,6 +23,7 @@ function generateAppImporter(appDetails) { code += `console.debug("Importing AlekSIS app entrypoint for ${appPackage}");\n`; code += `import ${importAppName} from '${indexPath}';\n`; code += `appObjects["${appMeta.name}"] = ${importAppName};\n`; + if appMeta.hasMessages { let messagesPath = appMeta.assetDir + "/messages/"; code += `appMessages["${appMeta.name}"] = {}`; @@ -36,18 +38,7 @@ function generateAppImporter(appDetails) { } code += "export default appObjects;\n"; code += "export { appObjects, appMessages };\n"; - return code; -} -function generateAppDetails(appDetails) { - let code = "let messages = {};\n"; - - for (const [appPackage, appMeta] of Object.entries(appDetails)) { - code += `messages["${appMeta.name}"] = JSON.parse('${JSON.stringify( - appMeta - )}');\n`; - } - code += "export default messages;\n"; return code; }