Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add id prop in query for script block type #2001

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add id prop in query for script block type #2001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/index.ts
View file
Open in desktop
Expand Up @@ -113,12 +113,18 @@ export default function loader(
const rawShortFilePath = path
.relative(rootContext || process.cwd(), filename)
.replace(/^(\.\.[\/\\])+/, '')
const shortFilePath = rawShortFilePath.replace(/\\/g, '/')
const id = hash(
isProduction
? shortFilePath + '\n' + source.replace(/\r\n/g, '\n')
: shortFilePath
)

const getScopeId = () => {
const shortFilePath = rawShortFilePath.replace(/\\/g, '/')
return hash(
isProduction
? shortFilePath + '\n' + source.replace(/\r\n/g, '\n')
: shortFilePath
)
}

const id =
typeof incomingQuery.id === 'string' ? incomingQuery.id : getScopeId()

// if the query has a type field, this is a language block request
// e.g. foo.vue?type=template&id=xxxxx
Expand Down Expand Up @@ -154,8 +160,9 @@ export default function loader(
const lang = script?.lang || scriptSetup?.lang
isTS = !!(lang && /tsx?/.test(lang))
const src = (script && !scriptSetup && script.src) || resourcePath
const idQuery = `&id=${id}`
const attrsQuery = attrsToQuery((scriptSetup || script)!.attrs, 'js')
const query = `?vue&type=script${attrsQuery}${resourceQuery}`
const query = `?vue&type=script${idQuery}${attrsQuery}${resourceQuery}`
const scriptRequest = stringifyRequest(src + query)
scriptImport =
`import script from ${scriptRequest}\n` +
Expand Down