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

Fix jsx hmr #1495

Merged
merged 3 commits into from
Jan 12, 2021
Merged

Fix jsx hmr #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce4949
fix: reload all components anyway when hmr in jsx
Jokcy Jan 12, 2021
3bb8d43
fix: remove code hash since we not compare anymore
Jokcy Jan 12, 2021
b6eb137
fix: fix tests for jsx-plugin
Jokcy Jan 12, 2021
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
12 changes: 7 additions & 5 deletions packages/playground/vue-jsx/__tests__/vue-jsx.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { editFile, isBuild, untilUpdated } from '../../testUtils'
import { editFile, isBuild, untilUpdated } from 'testUtils'

test('should render', async () => {
expect(await page.textContent('.named')).toMatch('0')
Expand All @@ -25,9 +25,10 @@ if (!isBuild) {
)
await untilUpdated(() => page.textContent('.named'), 'named updated 0')

// should not affect other components on the page
expect(await page.textContent('.named-specifier')).toMatch('2')
expect(await page.textContent('.default')).toMatch('3')
// affect all components in same file
expect(await page.textContent('.named-specifier')).toMatch('1')
expect(await page.textContent('.default')).toMatch('2')
// should not affect other components from different file
expect(await page.textContent('.default-tsx')).toMatch('4')
})

Expand All @@ -40,8 +41,9 @@ if (!isBuild) {
'named specifier updated 1'
)

// affect all components in same file
expect(await page.textContent('.default')).toMatch('2')
// should not affect other components on the page
expect(await page.textContent('.default')).toMatch('3')
expect(await page.textContent('.default-tsx')).toMatch('4')
})

Expand Down
29 changes: 9 additions & 20 deletions packages/plugin-vue-jsx/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,14 @@ function vueJsxPlugin(options = {}) {

// check for hmr injection
/**
* @type {{ name: string, hash: string }[]}
* @type {{ name: string }[]}
*/
const declaredComponents = []
/**
* @type {{
* local: string,
* exported: string,
* id: string,
* hash: string
* }[]}
*/
const hotComponents = []
Expand All @@ -91,11 +90,10 @@ function vueJsxPlugin(options = {}) {
) {
hotComponents.push(
...parseComponentDecls(node.declaration, code).map(
({ name, hash: _hash }) => ({
({ name }) => ({
local: name,
exported: name,
id: hash(id + name),
hash: _hash
id: hash(id + name)
})
)
)
Expand All @@ -112,8 +110,7 @@ function vueJsxPlugin(options = {}) {
hotComponents.push({
local: spec.local.name,
exported: spec.exported.name,
id: hash(id + spec.exported.name),
hash: matched.hash
id: hash(id + spec.exported.name)
})
}
}
Expand All @@ -131,19 +128,15 @@ function vueJsxPlugin(options = {}) {
hotComponents.push({
local: node.declaration.name,
exported: 'default',
id: hash(id + 'default'),
hash: matched.hash
id: hash(id + 'default')
})
}
} else if (isDefineComponentCall(node.declaration)) {
hasDefault = true
hotComponents.push({
local: '__default__',
exported: 'default',
id: hash(id + 'default'),
hash: hash(
code.slice(node.declaration.start, node.declaration.end)
)
id: hash(id + 'default')
})
}
}
Expand All @@ -160,14 +153,11 @@ function vueJsxPlugin(options = {}) {
}

let callbackCode = ``
for (const { local, exported, id, hash } of hotComponents) {
for (const { local, exported, id } of hotComponents) {
code +=
`\n${local}.__hmrId = "${id}"` +
`\n${local}.__hmrHash = "${hash}"` +
`\n__VUE_HMR_RUNTIME__.createRecord("${id}", ${local})`
callbackCode +=
`\n if (__${exported}.__hmrHash !== ${local}.__hmrHash) ` +
`__VUE_HMR_RUNTIME__.reload("${id}", __${exported})`
callbackCode += `\n__VUE_HMR_RUNTIME__.reload("${id}", __${exported})`
}

code += `\nimport.meta.hot.accept(({${hotComponents
Expand Down Expand Up @@ -195,8 +185,7 @@ function parseComponentDecls(node, source) {
for (const decl of node.declarations) {
if (decl.id.type === 'Identifier' && isDefineComponentCall(decl.init)) {
names.push({
name: decl.id.name,
hash: hash(source.slice(decl.init.start, decl.init.end))
name: decl.id.name
})
}
}
Expand Down