Merge remote-tracking branch 'origin/move-config-root'

This commit is contained in:
Bruno Windels 2022-05-18 20:40:12 +02:00
commit 8a5f1ed9cd
2 changed files with 12 additions and 6 deletions

View file

@ -33,7 +33,7 @@ function appendVariablesToCSS(variables, cssSource) {
function addThemesToConfig(bundle, manifestLocations, defaultThemes) { function addThemesToConfig(bundle, manifestLocations, defaultThemes) {
for (const [fileName, info] of Object.entries(bundle)) { for (const [fileName, info] of Object.entries(bundle)) {
if (fileName === "assets/config.json") { if (fileName === "config.json") {
const source = new TextDecoder().decode(info.source); const source = new TextDecoder().decode(info.source);
const config = JSON.parse(source); const config = JSON.parse(source);
config["themeManifests"] = manifestLocations; config["themeManifests"] = manifestLocations;

View file

@ -16,11 +16,17 @@ export default defineConfig(({mode}) => {
sourcemap: true, sourcemap: true,
rollupOptions: { rollupOptions: {
output: { output: {
assetFileNames: (asset) => assetFileNames: (asset) => {
asset.name.includes("config.json") || if (asset.name.includes("config.json")) {
asset.name.match(/theme-.+\.json/) return "[name][extname]";
? "assets/[name][extname]" }
: "assets/[name].[hash][extname]", else if (asset.name.match(/theme-.+\.json/)) {
return "assets/[name][extname]";
}
else {
return "assets/[name].[hash][extname]";
}
}
}, },
}, },
}, },