From f55b7ad1da589f592be2e3ea11c117f75e05073b Mon Sep 17 00:00:00 2001 From: Stanislav Atroschenko Date: Wed, 9 Nov 2022 14:46:38 +0300 Subject: [PATCH] fix redirects build AG-14398 Merge in ADGUARD-FILTERS/scriptlets from fix/AG-14398_01 to release/v1.7 Squashed commit of the following: commit ecf384b69c1bca677d8a1c7bbf8d2e9f4bc9455d Author: Stanislav A Date: Wed Nov 9 14:38:37 2022 +0300 fix redirects build --- scripts/build-redirects.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build-redirects.js b/scripts/build-redirects.js index 3f2293da..d12437e4 100644 --- a/scripts/build-redirects.js +++ b/scripts/build-redirects.js @@ -14,7 +14,7 @@ import { minify } from 'terser'; import * as redirectsList from '../src/redirects/redirects-list'; import { version } from '../package.json'; import { rollupStandard } from './rollup-runners'; -import { writeFileAsync, getDataFromFiles } from './helpers'; +import { writeFile, getDataFromFiles } from './helpers'; import { redirectsFilenames, REDIRECTS_SRC_RELATIVE_DIR_PATH } from './constants'; const FILE_NAME = 'redirects.yml'; @@ -202,7 +202,7 @@ export const getPreparedRedirects = async (options) => { const buildJsRedirectFiles = async (redirectsData) => { const saveRedirectData = async (redirect) => { const redirectPath = `${REDIRECT_FILES_PATH}/${redirect.file}`; - await writeFileAsync(redirectPath, redirect.content); + await writeFile(redirectPath, redirect.content); }; await Promise.all(Object.values(redirectsData) @@ -230,9 +230,9 @@ const buildStaticRedirectFiles = async (redirectsData) => { // replace them all because base64 isn't supposed to have them contentToWrite = content.replace(/(\r\n|\n|\r|\s)/gm, ''); const buff = Buffer.from(contentToWrite, 'base64'); - await writeFileAsync(redirectPath, buff); + await writeFile(redirectPath, buff); } else { - await writeFileAsync(redirectPath, contentToWrite); + await writeFile(redirectPath, contentToWrite); } }; @@ -251,7 +251,7 @@ const buildRedirectsYamlFile = async (mergedRedirects) => { // add version and title to the top yamlRedirects = `${banner}${yamlRedirects}`; - await writeFileAsync(RESULT_PATH, yamlRedirects); + await writeFile(RESULT_PATH, yamlRedirects); }; export const prebuildRedirects = async () => { @@ -372,7 +372,7 @@ export const buildRedirectsForCorelibs = async () => { try { const jsonString = JSON.stringify(base64Redirects, null, 4); - await writeFileAsync(CORELIBS_RESULT_PATH, jsonString); + await writeFile(CORELIBS_RESULT_PATH, jsonString); } catch (e) { // eslint-disable-next-line no-console console.log(`Couldn't save to ${CORELIBS_RESULT_PATH}, because of: ${e.message}`);