Skip to content

Commit bff5ea1

Browse files
committed
refactor: remove unecessary params
1 parent 8fd23df commit bff5ea1

1 file changed

Lines changed: 14 additions & 54 deletions

File tree

packages/plugin-rsc/src/plugin.ts

Lines changed: 14 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import * as esModuleLexer from 'es-module-lexer'
99
import MagicString from 'magic-string'
1010
import {
1111
type DevEnvironment,
12-
type Environment,
1312
type EnvironmentModuleNode,
1413
type Plugin,
1514
type ResolvedConfig,
@@ -583,9 +582,7 @@ export default function vitePluginRsc(
583582
if (id === '\0virtual:vite-rsc/assets-manifest') {
584583
assert(this.environment.name !== 'client')
585584
assert(this.environment.mode === 'dev')
586-
const entryUrl = assetsURL('@id/__x00__' + VIRTUAL_ENTRIES.browser, {
587-
environment: this.environment,
588-
})
585+
const entryUrl = assetsURL('@id/__x00__' + VIRTUAL_ENTRIES.browser)
589586
const manifest: AssetsManifest = {
590587
bootstrapScriptContent: `import(${serializeValueWithRuntime(entryUrl)})`,
591588
clientReferenceDeps: {},
@@ -622,36 +619,23 @@ export default function vitePluginRsc(
622619
const serverResources: Record<string, AssetDeps> = {}
623620
const rscAssetDeps = collectAssetDeps(rscBundle)
624621
for (const [id, meta] of Object.entries(serverResourcesMetaMap)) {
625-
serverResources[meta.key] = assetsURLOfDeps(
626-
{
627-
js: [],
628-
css: rscAssetDeps[id]?.deps.css ?? [],
629-
},
630-
{
631-
environment: this.environment,
632-
enableRuntimeValue: true,
633-
},
634-
)
622+
serverResources[meta.key] = assetsURLOfDeps({
623+
js: [],
624+
css: rscAssetDeps[id]?.deps.css ?? [],
625+
})
635626
}
636627

637628
const assetDeps = collectAssetDeps(bundle)
638629
const entry = Object.values(assetDeps).find(
639630
(v) => v.chunk.name === 'index',
640631
)
641632
assert(entry)
642-
const entryUrl = assetsURL(entry.chunk.fileName, {
643-
environment: this.environment,
644-
enableRuntimeValue: true,
645-
})
633+
const entryUrl = assetsURL(entry.chunk.fileName)
646634
const clientReferenceDeps: Record<string, AssetDeps> = {}
647635
for (const [id, meta] of Object.entries(clientReferenceMetaMap)) {
648636
const deps: AssetDeps = assetDeps[id]?.deps ?? { js: [], css: [] }
649637
clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(
650638
mergeAssetDeps(deps, entry.deps),
651-
{
652-
environment: this.environment,
653-
enableRuntimeValue: true,
654-
},
655639
)
656640
}
657641
buildAssetsManifest = {
@@ -1311,25 +1295,15 @@ function serializeValueWithRuntime(value: any) {
13111295
return result
13121296
}
13131297

1314-
function assetsURL(
1315-
url: string,
1316-
{
1317-
environment,
1318-
enableRuntimeValue = false,
1319-
}: {
1320-
environment: Environment
1321-
enableRuntimeValue?: boolean
1322-
},
1323-
) {
1298+
function assetsURL(url: string) {
13241299
if (
1325-
enableRuntimeValue &&
1326-
environment.mode === 'build' &&
1300+
config.command === 'build' &&
13271301
typeof config.experimental?.renderBuiltUrl === 'function'
13281302
) {
13291303
const result = config.experimental.renderBuiltUrl(url, {
13301304
type: 'asset',
13311305
hostType: 'js',
1332-
ssr: environment.name === 'ssr',
1306+
ssr: true,
13331307
hostId: '',
13341308
})
13351309

@@ -1354,24 +1328,15 @@ function assetsURL(
13541328
return config.base + url
13551329
}
13561330

1357-
function assetsURLOfDeps(
1358-
deps: AssetDeps,
1359-
{
1360-
environment,
1361-
enableRuntimeValue = false,
1362-
}: {
1363-
environment: Environment
1364-
enableRuntimeValue?: boolean
1365-
},
1366-
) {
1331+
function assetsURLOfDeps(deps: AssetDeps) {
13671332
return {
13681333
js: deps.js.map((href) => {
13691334
assert(typeof href === 'string')
1370-
return assetsURL(href, { environment, enableRuntimeValue })
1335+
return assetsURL(href)
13711336
}),
13721337
css: deps.css.map((href) => {
13731338
assert(typeof href === 'string')
1374-
return assetsURL(href, { environment, enableRuntimeValue })
1339+
return assetsURL(href)
13751340
}),
13761341
}
13771342
}
@@ -1675,9 +1640,7 @@ export function vitePluginRscCss(
16751640
for (const file of [mod.file, ...result.visitedFiles]) {
16761641
this.addWatchFile(file)
16771642
}
1678-
const hrefs = result.hrefs.map((href) =>
1679-
assetsURL(href.slice(1), { environment: this.environment }),
1680-
)
1643+
const hrefs = result.hrefs.map((href) => assetsURL(href.slice(1)))
16811644
return `export default ${serializeValueWithRuntime(hrefs)}`
16821645
}
16831646
},
@@ -1764,10 +1727,7 @@ export function vitePluginRscCss(
17641727
'@id/__x00__virtual:vite-rsc/importer-resources-browser?importer=' +
17651728
encodeURIComponent(importer),
17661729
]
1767-
const deps = assetsURLOfDeps(
1768-
{ css: cssHrefs, js: jsHrefs },
1769-
{ environment: this.environment },
1770-
)
1730+
const deps = assetsURLOfDeps({ css: cssHrefs, js: jsHrefs })
17711731
return generateResourcesCode(serializeValueWithRuntime(deps))
17721732
} else {
17731733
const key = normalizePath(path.relative(config.root, importer))

0 commit comments

Comments
 (0)