Skip to content

Commit d35cf81

Browse files
committed
refactor: expose only vitePluginRscMinimal
1 parent ca2a1ff commit d35cf81

File tree

2 files changed

+13
-30
lines changed

2 files changed

+13
-30
lines changed

packages/plugin-rsc/examples/browser-mode/vite.config.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
11
import { defaultClientConditions, defineConfig } from 'vite'
2-
import {
3-
vitePluginRscMinimal,
4-
vitePluginUseClient,
5-
vitePluginUseServer,
6-
vitePluginDefineEncryptionKey,
7-
} from '@vitejs/plugin-rsc/plugin'
2+
import { vitePluginRscMinimal } from '@vitejs/plugin-rsc/plugin'
83
// import inspect from 'vite-plugin-inspect'
94

105
export default defineConfig({
116
plugins: [
127
// inspect(),
13-
vitePluginRscMinimal(),
14-
vitePluginUseClient({
15-
environment: {
16-
rsc: 'client',
17-
browser: 'react_client',
18-
},
19-
}),
20-
vitePluginUseServer({
21-
environment: {
22-
rsc: 'client',
23-
browser: 'react_client',
24-
},
25-
}),
26-
vitePluginDefineEncryptionKey({
8+
vitePluginRscMinimal({
279
environment: {
2810
rsc: 'client',
2911
browser: 'react_client',

packages/plugin-rsc/src/plugin.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,13 @@ export type RscPluginOptions = {
145145
}
146146

147147
/** @experimental */
148-
export function vitePluginRscMinimal(): Plugin[] {
148+
export function vitePluginRscMinimal(
149+
rscPluginOptions: RscPluginOptions = {},
150+
): Plugin[] {
149151
return [
150152
{
151153
name: 'rsc:minimal',
154+
enforce: 'pre',
152155
async config() {
153156
await esModuleLexer.init
154157
},
@@ -173,6 +176,9 @@ export function vitePluginRscMinimal(): Plugin[] {
173176
},
174177
},
175178
...vitePluginRscCore(),
179+
...vitePluginUseClient(rscPluginOptions),
180+
...vitePluginUseServer(rscPluginOptions),
181+
...vitePluginDefineEncryptionKey(rscPluginOptions),
176182
]
177183
}
178184

@@ -877,9 +883,7 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
877883
return ''
878884
},
879885
},
880-
...vitePluginUseClient(rscPluginOptions),
881-
...vitePluginUseServer(rscPluginOptions),
882-
...vitePluginDefineEncryptionKey(rscPluginOptions),
886+
...vitePluginRscMinimal(rscPluginOptions),
883887
...vitePluginFindSourceMapURL(),
884888
...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
885889
...(rscPluginOptions.validateImports !== false
@@ -963,8 +967,7 @@ function hashString(v: string) {
963967
return createHash('sha256').update(v).digest().toString('hex').slice(0, 12)
964968
}
965969

966-
/** @experimental */
967-
export function vitePluginUseClient(
970+
function vitePluginUseClient(
968971
useClientPluginOptions: Pick<
969972
RscPluginOptions,
970973
'ignoredPackageWarnings' | 'keepUseCientProxy' | 'environment'
@@ -1171,8 +1174,7 @@ export function vitePluginUseClient(
11711174
]
11721175
}
11731176

1174-
/** @experimental */
1175-
export function vitePluginDefineEncryptionKey(
1177+
function vitePluginDefineEncryptionKey(
11761178
useServerPluginOptions: Pick<
11771179
RscPluginOptions,
11781180
'defineEncryptionKey' | 'environment'
@@ -1236,8 +1238,7 @@ export function vitePluginDefineEncryptionKey(
12361238
]
12371239
}
12381240

1239-
/** @experimental */
1240-
export function vitePluginUseServer(
1241+
function vitePluginUseServer(
12411242
useServerPluginOptions: Pick<
12421243
RscPluginOptions,
12431244
'ignoredPackageWarnings' | 'enableActionEncryption' | 'environment'

0 commit comments

Comments
 (0)