targetDir doesn't need to be global anymore

This commit is contained in:
Bruno Windels 2020-10-02 09:33:57 +02:00
parent 441bfa4890
commit 38a30bcc49

View file

@ -45,7 +45,6 @@ const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename); const __dirname = dirname(__filename);
const projectDir = path.join(__dirname, "../"); const projectDir = path.join(__dirname, "../");
const cssSrcDir = path.join(projectDir, "src/ui/web/css/"); const cssSrcDir = path.join(projectDir, "src/ui/web/css/");
const targetDir = path.join(projectDir, "target/");
const program = new commander.Command(); const program = new commander.Command();
program program
@ -65,6 +64,7 @@ async function build() {
themes.push(themeName); themes.push(themeName);
}); });
// clear target dir // clear target dir
const targetDir = path.join(projectDir, "target/");
await removeDirIfExists(targetDir); await removeDirIfExists(targetDir);
await createDirs(targetDir, themes); await createDirs(targetDir, themes);
const assets = new AssetMap(targetDir); const assets = new AssetMap(targetDir);
@ -111,7 +111,7 @@ async function createDirs(targetDir, themes) {
async function copyThemeAssets(themes, assets) { async function copyThemeAssets(themes, assets) {
for (const theme of themes) { for (const theme of themes) {
const themeDstFolder = path.join(targetDir, `themes/${theme}`); const themeDstFolder = path.join(assets.directory, `themes/${theme}`);
const themeSrcFolder = path.join(cssSrcDir, `themes/${theme}`); const themeSrcFolder = path.join(cssSrcDir, `themes/${theme}`);
const themeAssets = await copyFolder(themeSrcFolder, themeDstFolder, file => { const themeAssets = await copyFolder(themeSrcFolder, themeDstFolder, file => {
return !file.endsWith(".css"); return !file.endsWith(".css");