From 146fee977e5f396efa5e4c068e7cb24af7c6a395 Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Fri, 18 Nov 2022 17:46:53 +0100 Subject: [PATCH] fix: manually add Telefunc's rollup input --- telefunc/node/vite/plugins/buildConfig.ts | 33 ++++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/telefunc/node/vite/plugins/buildConfig.ts b/telefunc/node/vite/plugins/buildConfig.ts index 16a4de5e..6631b408 100644 --- a/telefunc/node/vite/plugins/buildConfig.ts +++ b/telefunc/node/vite/plugins/buildConfig.ts @@ -1,6 +1,6 @@ export { buildConfig } -import type { Plugin } from 'vite' +import type { Plugin, ResolvedConfig } from 'vite' import type { InputOption } from 'rollup' import { telefuncFilesGlobFileNameBase } from '../importGlob/telefuncFilesGlobFileNameBase' import { telefuncFilesGlobFilePath } from '../importGlob/telefuncFilesGlobPath' @@ -10,26 +10,27 @@ function buildConfig(): Plugin { return { name: 'telefunc:buildConfig', apply: 'build', - config: (config) => { - if (config.build?.ssr) { - const input = { - [telefuncFilesGlobFileNameBase]: telefuncFilesGlobFilePath, - ...normalizeRollupInput(config.build?.rollupOptions?.input) - } - return { - build: { - rollupOptions: { input } - } - } - } - }, + enforce: 'post', configResolved(config) { - const outDir = determineOutDir(config) - if (outDir) config.build.outDir = outDir + setOutDir(config) + addRollupInput(config) } } } +function setOutDir(config: ResolvedConfig) { + const outDir = determineOutDir(config) + if (outDir) config.build.outDir = outDir +} + +function addRollupInput(config: ResolvedConfig) { + if (!config.build?.ssr) { + return + } + config.build.rollupOptions.input = normalizeRollupInput(config.build.rollupOptions.input) + config.build.rollupOptions.input[telefuncFilesGlobFileNameBase] = telefuncFilesGlobFilePath +} + function normalizeRollupInput(input?: InputOption): Record { if (!input) { return {}