Skip to content

Commit

Permalink
chore: use getVikeConfig
Browse files Browse the repository at this point in the history
  • Loading branch information
magne4000 committed Feb 18, 2025
1 parent 692baa4 commit 5ac3649
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions packages/vike/src/plugins/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { normalizePath, type Plugin } from "vite";
import { getVercelAPI } from "vite-plugin-vercel/api";
import type { ViteVercelRouteOverrides } from "vite-plugin-vercel/types";
import { assert } from "../utils/assert";
import { getVikeConfig } from "vike/plugin";

type PrerenderContextOutputPage = {
filePath: string;
Expand All @@ -12,8 +13,7 @@ type PrerenderContextOutputPage = {
};

export function routesPlugin(): Plugin {
// FIXME typing
let vikeConfig: any | undefined = undefined;
let vikeConfig: ReturnType<typeof getVikeConfig> | undefined = undefined;
let vikePrerenderOutdir: string | undefined = undefined;
const vikePages: {
pageId: string;
Expand All @@ -39,8 +39,7 @@ export function routesPlugin(): Plugin {
);
}
if (this.environment.name === "ssr") {
// TODO assert
vikeConfig = this.environment.config.vike;
vikeConfig = getVikeConfig(this.environment.config);

for (const [pageId, page] of Object.entries(vikeConfig.pages)) {
const rawIsr = extractIsr(page.config);
Expand Down Expand Up @@ -88,7 +87,8 @@ export function routesPlugin(): Plugin {
handler() {
if (this.environment.name === "vercel_client") {
// Emit prerendered files
const prerenderContext: { _output?: PrerenderContextOutputPage[] } | undefined = vikeConfig?.prerenderContext;
const prerenderContext: { _output?: PrerenderContextOutputPage[] } | undefined =
vikeConfig?.prerenderContext as any;
if (prerenderContext?._output && vikePrerenderOutdir) {
// With overrides, HTML file can be accessed without the .html file extension
const overrides: ViteVercelRouteOverrides = {};
Expand Down Expand Up @@ -167,7 +167,7 @@ export function routesPluginDev(): Plugin {

configureServer(server) {
const { addVercelEntry } = getVercelAPI(server);
const vikeConfig = server.config.vike;
const vikeConfig = getVikeConfig(server.config);

const vikePages: {
pageId: string;
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5ac3649

Please sign in to comment.