Skip to content

fix(types): widen RollupConfig.plugins to accept Rolldown-typed plugins [v3] #4483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dargmuesli wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

fix(types): widen RollupConfig.plugins to accept Rolldown-typed plugins [v3] #4483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/build/rollup/dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Nitro, RollupConfig } from "nitro/types";
import type { RollupWatcher } from "rollup";
import type { RollupOptions, RollupWatcher } from "rollup";
import { watch as chokidarWatch } from "chokidar";
import { defu } from "defu";
import { basename, join } from "pathe";
Expand Down Expand Up @@ -68,7 +68,7 @@ export async function watchDev(nitro: Nitro, rollupConfig: RollupConfig) {

function startRollupWatcher(nitro: Nitro, rollupConfig: RollupConfig) {
const watcher = rollup.watch(
defu(rollupConfig, {
defu(rollupConfig as RollupOptions, {
watch: {
chokidar: nitro.options.watchOptions,
},
Expand Down
4 changes: 2 additions & 2 deletions src/build/rollup/prod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { generateFSTree } from "../../utils/fs-tree.ts";
import { writeTypes } from "../types.ts";
import { writeBuildInfo } from "../info.ts";
import { formatRollupError } from "./error.ts";
import type { RollupOutput } from "rollup";
import type { RollupOptions, RollupOutput } from "rollup";

export async function buildProduction(nitro: Nitro, rollupConfig: RollupConfig) {
const rollup = await import("rollup");
Expand All @@ -20,7 +20,7 @@ export async function buildProduction(nitro: Nitro, rollupConfig: RollupConfig)
nitro.logger.info(
`Building server (builder: \`rollup\`, preset: \`${nitro.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro.options.compatibilityDate)}\`)`
);
const build = await rollup.rollup(rollupConfig).catch((error) => {
const build = await rollup.rollup(rollupConfig as RollupOptions).catch((error) => {
nitro.logger.error(formatRollupError(error));
throw error;
});
Expand Down
7 changes: 6 additions & 1 deletion src/types/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ import type {
TransformOptions as RolldownTransformOptions,
} from "rolldown";

export type RollupConfig = RollupInputOptions & {
export type RollupConfig = Omit<RollupInputOptions, "plugins"> & {
output?: RollupOutputOptions;
// Vite 8 / `@vitejs/plugin-vue` etc. return Rolldown-typed plugins now that
// Vite's `Plugin` extends `Rolldown.Plugin` instead of Rollup's own type.
// `rollupConfig` is also reused for the `rolldown` builder (see
// `build/vite/bundler.ts`), so accept either shape here.
plugins?: RollupInputOptions["plugins"] | RolldownInputOptions["plugins"];
};

export type RolldownConfig = RolldownInputOptions & {
Expand Down
Loading