Skip to content

Commit 3969f86

Browse files
authored
refactor(rsc): simplify validateImportPlugin (#814)
1 parent 4da5810 commit 3969f86

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

packages/plugin-rsc/src/plugin.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,9 +1007,10 @@ import.meta.hot.on("rsc:update", () => {
10071007
...vitePluginRscMinimal(rscPluginOptions, manager),
10081008
...vitePluginFindSourceMapURL(),
10091009
...vitePluginRscCss(rscPluginOptions, manager),
1010-
validateImportPlugin({
1010+
{
1011+
...validateImportPlugin(),
10111012
apply: () => rscPluginOptions.validateImports !== false,
1012-
}),
1013+
},
10131014
scanBuildStripPlugin({ manager }),
10141015
...cjsModuleRunnerPlugin(),
10151016
...globalAsyncLocalStoragePlugin(),

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ 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(
7-
applyOptions: Pick<Plugin, 'apply'>,
8-
): Plugin {
6+
export function validateImportPlugin(): Plugin {
97
return {
108
name: 'rsc:validate-imports',
11-
...applyOptions,
129
resolveId: {
1310
order: 'pre',
1411
async handler(source, importer, options) {

0 commit comments

Comments
 (0)