From 400879f59da93135e06b4e18aa576693700a6389 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 3 Jun 2026 06:05:28 +0300 Subject: [PATCH] serviceworker troubles --- build/sw_plugin.js | 24 +++++++++++++++--------- vite.config.js | 1 - 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/build/sw_plugin.js b/build/sw_plugin.js index 39cc31405..f8141920d 100644 --- a/build/sw_plugin.js +++ b/build/sw_plugin.js @@ -27,12 +27,13 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => { Object.entries(alias).forEach(([source, dest]) => { esbuildAlias[source] = dest.startsWith('/') ? projectRoot + dest : dest }) + let localConfig return { name: 'dev-sw-plugin', apply: 'serve', - configResolved() { - /* no-op */ + configResolved(config) { + localConfig = config }, resolveId(id) { const name = id.startsWith('/') ? id.slice(1) : id @@ -57,9 +58,13 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => { * https://bugzilla.mozilla.org/show_bug.cgi?id=1360870 */ async transform(code, id) { - if (id === swFullSrc && transformSW) { + if (id === swFullSrc) { const res = await esbuild.build({ entryPoints: [swSrc], + define: { + 'process.env': JSON.stringify(localConfig.define['process.env']), + 'COMMIT_HASH': JSON.stringify(localConfig.define['COMMIT_HASH']), + }, bundle: true, write: false, outfile: 'sw-pleroma.js', @@ -135,16 +140,17 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { publicDir: false, build: { ...resolvedConfig.build, - lib: { - entry: swSrc, - formats: ['iife'], - name: 'sw_pleroma', - }, emptyOutDir: false, rolldownOptions: { + input: { + main: swSrc + }, + context: 'self', output: { entryFileNames: swDest, - }, + codeSplitting: false, + format: 'iife', + } }, }, configFile: false, diff --git a/vite.config.js b/vite.config.js index 6ca25ddbd..9586b1aeb 100644 --- a/vite.config.js +++ b/vite.config.js @@ -198,7 +198,6 @@ export default defineConfig(async ({ mode, command }) => { main: 'index.html', }, output: { - inlineDynamicImports: false, entryFileNames(chunkInfo) { const id = chunkInfo.facadeModuleId if (id.endsWith(swSrc)) {