Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/plugin-rsc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"estree-walker": "^3.0.3",
"magic-string": "^0.30.19",
"periscopic": "^4.0.2",
"strip-literal": "^3.1.0",
"turbo-stream": "^3.1.0",
"vitefu": "^1.1.1"
},
Expand Down
16 changes: 10 additions & 6 deletions packages/plugin-rsc/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { scanBuildStripPlugin } from './plugins/scan'
import { validateImportPlugin } from './plugins/validate-import'
import { vitePluginFindSourceMapURL } from './plugins/find-source-map-url'
import { parseCssVirtual, toCssVirtual, parseIdQuery } from './plugins/shared'
import { stripLiteral } from 'strip-literal'

const isRolldownVite = 'rolldownVersion' in vite

Expand Down Expand Up @@ -702,10 +703,11 @@ export default function vitePluginRsc(
if (!code.includes('import.meta.viteRsc.loadModule')) return
const { server } = manager
const s = new MagicString(code)
for (const match of code.matchAll(
for (const match of stripLiteral(code).matchAll(
/import\.meta\.viteRsc\.loadModule\(([\s\S]*?)\)/dg,
)) {
const argCode = match[1]!.trim()
const [argStart, argEnd] = match.indices![1]!
const argCode = code.slice(argStart, argEnd).trim()
const [environmentName, entryName] = evalValue(`[${argCode}]`)
let replacement: string
if (
Expand Down Expand Up @@ -973,10 +975,11 @@ export default assetsManifest.bootstrapScriptContent;
assert(this.environment.name !== 'client')
const output = new MagicString(code)

for (const match of code.matchAll(
for (const match of stripLiteral(code).matchAll(
/import\s*\.\s*meta\s*\.\s*viteRsc\s*\.\s*loadBootstrapScriptContent\(([\s\S]*?)\)/dg,
)) {
const argCode = match[1]!.trim()
const [argStart, argEnd] = match.indices![1]!
const argCode = code.slice(argStart, argEnd).trim()
const entryName = evalValue(argCode)
assert(
entryName,
Expand Down Expand Up @@ -2087,11 +2090,12 @@ function vitePluginRscCss(
const output = new MagicString(code)
let importAdded = false

for (const match of code.matchAll(
for (const match of stripLiteral(code).matchAll(
/import\.meta\.viteRsc\.loadCss\(([\s\S]*?)\)/dg,
)) {
const [start, end] = match.indices![0]!
const argCode = match[1]!.trim()
const [argStart, argEnd] = match.indices![1]!
const argCode = code.slice(argStart, argEnd).trim()
let importer = id
if (argCode) {
const argValue = evalValue<string>(argCode)
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

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

Loading