From 9c162bc2ce6faba4b63b1587b994ab8f9f6b4671 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sat, 9 Aug 2025 01:21:02 +0400 Subject: [PATCH] Fixed defines not being correctly passed to content scripts & styles --- .vite/lib/content-scripts.js | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.vite/lib/content-scripts.js b/.vite/lib/content-scripts.js index 5a84761..a59da49 100644 --- a/.vite/lib/content-scripts.js +++ b/.vite/lib/content-scripts.js @@ -159,6 +159,19 @@ export async function buildScriptsAndStyles(buildOptions) { } const aliasesSettings = makeAliases(buildOptions.rootDir); + const defineConstants = { + __CURRENT_SITE__: JSON.stringify('furbooru'), + __CURRENT_SITE_NAME__: JSON.stringify('Furbooru'), + }; + + const derpibooruSwapPlugin = SwapDefinedVariablesPlugin({ + envVariable: 'SITE', + expectedValue: 'derpibooru', + define: { + __CURRENT_SITE__: JSON.stringify('derpibooru'), + __CURRENT_SITE_NAME__: JSON.stringify('Derpibooru'), + } + }); // Building all scripts together with AMD loader in mind await build({ @@ -194,16 +207,9 @@ export async function buildScriptsAndStyles(buildOptions) { .get(fileName) ?.push(...dependencies); }), - ScssViteReadEnvVariableFunctionPlugin(), - SwapDefinedVariablesPlugin({ - envVariable: 'SITE', - expectedValue: 'derpibooru', - define: { - __CURRENT_SITE__: JSON.stringify('derpibooru'), - __CURRENT_SITE_NAME__: JSON.stringify('Derpibooru'), - } - }), - ] + derpibooruSwapPlugin, + ], + define: defineConstants, }); // Build styles separately because AMD converts styles to JS files. @@ -226,11 +232,10 @@ export async function buildScriptsAndStyles(buildOptions) { }, plugins: [ wrapScriptIntoIIFE(), + ScssViteReadEnvVariableFunctionPlugin(), + derpibooruSwapPlugin, ], - define: { - __CURRENT_SITE__: JSON.stringify('furbooru'), - __CURRENT_SITE_NAME__: JSON.stringify('Furbooru'), - } + define: defineConstants, }); return pathsReplacement;