Skip to content

Commit 6b1f6ff

Browse files
committed
feat: nested plugins
1 parent bfa6de4 commit 6b1f6ff

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

adex/src/vite.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ const adapterMap = {
2929

3030
/**
3131
* @param {import("./vite.js").AdexOptions} [options]
32-
* @returns
32+
* @returns {(import("vite").Plugin)[]}
3333
*/
3434
export function adex({
3535
fonts,
3636
islands = false,
3737
ssr = true,
3838
adapter: adapter = 'node',
39-
__clientConfig = {},
4039
} = {}) {
40+
// @ts-expect-error probably because of the `.filter`
4141
return [
4242
preactPages({
4343
root: '/src/pages',
@@ -135,7 +135,7 @@ export function adex({
135135

136136
// SSR/Render Server Specific plugins
137137
ssr && adexServerBuilder({ fonts, adapter, islands }),
138-
]
138+
].filter(Boolean)
139139
}
140140

141141
/**
@@ -210,7 +210,7 @@ function adexClientBuilder({ ssr = true, islands = false } = {}) {
210210
*/
211211
function adexBuildPrep({ islands = false }) {
212212
return {
213-
name: 'remover',
213+
name: 'adex-build-prep',
214214
apply: 'build',
215215
async configResolved(config) {
216216
if (!islands) return
@@ -497,7 +497,7 @@ function adexDevServer({ islands = false } = {}) {
497497
const devCSSMap = new Map()
498498
let cfg
499499
return {
500-
name: adexDevServer.name,
500+
name: 'adex-dev-server',
501501
apply: 'serve',
502502
enforce: 'pre',
503503
configResolved(_cfg) {
@@ -596,6 +596,10 @@ function adexServerBuilder({ fonts, adapter, islands }) {
596596

597597
console.log(`\nBuilding Server: ${serverOutDir}\n`)
598598

599+
const sanitizedPlugins = (cfg.plugins ?? [])
600+
.filter(d => !d.name.startsWith('vite:'))
601+
.filter(d => !d.name.startsWith('adex-'))
602+
599603
await build({
600604
configFile: false,
601605
ssr: {
@@ -696,6 +700,7 @@ function adexServerBuilder({ fonts, adapter, islands }) {
696700
),
697701
addFontsPlugin(fonts),
698702
islands && adexIslandsBuilder(),
703+
...sanitizedPlugins,
699704
],
700705
build: {
701706
outDir: serverOutDir,
@@ -776,7 +781,7 @@ function preactPages({
776781
replacer = '',
777782
} = {}) {
778783
return {
779-
name: 'routes',
784+
name: 'adex-routes',
780785
enforce: 'pre',
781786
resolveId(id) {
782787
if (id !== virtualId) {

0 commit comments

Comments
 (0)