Skip to content

Commit 4da5810

Browse files
authored
fix(rsc): delay validateImportPlugin setup (#813)
1 parent 07a64c2 commit 4da5810

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

packages/plugin-rsc/src/plugin.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,10 +1007,9 @@ import.meta.hot.on("rsc:update", () => {
10071007
...vitePluginRscMinimal(rscPluginOptions, manager),
10081008
...vitePluginFindSourceMapURL(),
10091009
...vitePluginRscCss(rscPluginOptions, manager),
1010-
// TODO: delay validateImports option check after config
1011-
...(rscPluginOptions.validateImports !== false
1012-
? [validateImportPlugin()]
1013-
: []),
1010+
validateImportPlugin({
1011+
apply: () => rscPluginOptions.validateImports !== false,
1012+
}),
10141013
scanBuildStripPlugin({ manager }),
10151014
...cjsModuleRunnerPlugin(),
10161015
...globalAsyncLocalStoragePlugin(),

packages/plugin-rsc/src/plugins/validate-import.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ import type { Plugin } from 'vite'
33
// https://github.com/vercel/next.js/blob/90f564d376153fe0b5808eab7b83665ee5e08aaf/packages/next/src/build/webpack-config.ts#L1249-L1280
44
// https://github.com/pcattori/vite-env-only/blob/68a0cc8546b9a37c181c0b0a025eb9b62dbedd09/src/deny-imports.ts
55
// https://github.com/sveltejs/kit/blob/84298477a014ec471839adf7a4448d91bc7949e4/packages/kit/src/exports/vite/index.js#L513
6-
export function validateImportPlugin(): Plugin {
6+
export function validateImportPlugin(
7+
applyOptions: Pick<Plugin, 'apply'>,
8+
): Plugin {
79
return {
810
name: 'rsc:validate-imports',
11+
...applyOptions,
912
resolveId: {
1013
order: 'pre',
1114
async handler(source, importer, options) {

0 commit comments

Comments
 (0)