Skip to content

fix: merge custom queries rather than appending #1911

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
Merged
merged 1 commit into from
Oct 28, 2022
Merged

fix: merge custom queries rather than appending #1911

merged 1 commit into from
Oct 28, 2022

Conversation

danielroe
Copy link
Member

Currently we simply append any existing resourceQuery to the end of any generated query string. In the event of a custom query being passed this leads to an invalid query, such as:

const scriptQuery = '?vue&type=script&lang=js?custom=true'
const templateQuery = '?vue&type=template&id=49803768?custom=true'
const styleQuery = '?vue&type=style&index=0&id=49803768&lang=css?custom=true'

The four locations where this happens are:

vue-loader/src/index.ts

Line 159 in 6dce21e

const query = `?vue&type=script${attrsQuery}${resourceQuery}`

vue-loader/src/index.ts

Line 179 in 6dce21e

const query = `?vue&type=template${idQuery}${scopedQuery}${tsQuery}${attrsQuery}${resourceQuery}`

vue-loader/src/index.ts

Line 199 in 6dce21e

const query = `?vue&type=style&index=${i}${idQuery}${inlineQuery}${attrsQuery}${resourceQuery}`

vue-loader/src/index.ts

Line 271 in 6dce21e

const query = `?vue&type=custom&index=${i}${blockTypeQuery}${issuerQuery}${attrsQuery}${resourceQuery}`

I realise this is a bit of an edge case, but as long as we are appending resourceQuery to the end of a query string we should probably normalise it.

@danielroe danielroe mentioned this pull request Jun 12, 2022
Merged
7 tasks
@haoqunjiang haoqunjiang merged commit 9e4249a into vuejs:next Oct 28, 2022
@danielroe danielroe deleted the fix/query-merging branch October 28, 2022 08:33
freddy38510 pushed a commit to freddy38510/vue-loader that referenced this pull request Nov 17, 2022
@danielroe @freddy38510
fix: merge custom queries rather than appending (vuejs#1911)
dccffeb
@diachedelic diachedelic mentioned this pull request Feb 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haoqunjiang haoqunjiang haoqunjiang approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danielroe @haoqunjiang