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(hmr): hmr style tag no support in html #7052

Merged
merged 6 commits into from Feb 24, 2022
Merged

fix(hmr): hmr style tag no support in html #7052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b629702
test: @import in html style tag hmr
poyoho Feb 23, 2022
e128b78
feat: hmr in style tag
poyoho Feb 23, 2022
13052fd
fix: html-proxy style tag
poyoho Feb 23, 2022
a08452c
fix: test index
poyoho Feb 23, 2022
8acea3c
fix: test
poyoho Feb 23, 2022
dfe2d3b
chore: good vari named
poyoho Feb 23, 2022
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
17 changes: 15 additions & 2 deletions packages/playground/assets/__tests__/assets.spec.ts
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@ import {
readManifest,
readFile,
editFile,
notifyRebuildComplete
notifyRebuildComplete,
untilUpdated
} from '../../testUtils'

const assetMatch = isBuild
Expand Down Expand Up @@ -37,7 +38,7 @@ describe('injected scripts', () => {

test('html-proxy', async () => {
const hasHtmlProxy = await page.$(
'script[type="module"][src="/foo/index.html?html-proxy&index=0.js"]'
'script[type="module"][src^="/foo/index.html?html-proxy"]'
)
if (isBuild) {
expect(hasHtmlProxy).toBeFalsy()
Expand Down Expand Up @@ -254,3 +255,15 @@ describe('css and assets in css in build watch', () => {
})
}
})

if (!isBuild) {
test('@import in html style tag hmr', async () => {
await untilUpdated(() => getColor('.import-css'), 'rgb(0, 136, 255)')
editFile(
'./css/import.css',
(code) => code.replace('#0088ff', '#00ff88'),
true
)
await untilUpdated(() => getColor('.import-css'), 'rgb(0, 255, 136)')
})
}
67 changes: 37 additions & 30 deletions packages/vite/src/node/server/middlewares/indexHtml.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import fs from 'fs'
import path from 'path'
import MagicString from 'magic-string'
import type { AttributeNode } from '@vue/compiler-dom'
import type { AttributeNode, ElementNode } from '@vue/compiler-dom'
import { NodeTypes } from '@vue/compiler-dom'
import type { Connect } from 'types/connect'
import type { IndexHtmlTransformHook } from '../../plugins/html'
Expand Down Expand Up @@ -94,9 +94,39 @@ const devHtmlHook: IndexHtmlTransformHook = async (
const base = config.base || '/'

const s = new MagicString(html)
let scriptModuleIndex = -1
let inlineModuleIndex = -1
const filePath = cleanUrl(htmlPath)

const addInlineModule = (node: ElementNode, ext: 'js' | 'css') => {
inlineModuleIndex++

const url = filePath.replace(normalizePath(config.root), '')

const contents = node.children
.map((child: any) => child.content || '')
.join('')

// add HTML Proxy to Map
addToHTMLProxyCache(config, url, inlineModuleIndex, contents)

// inline js module. convert to src="proxy"
const modulePath = `${
config.base + htmlPath.slice(1)
}?html-proxy&index=${inlineModuleIndex}.${ext}`

// invalidate the module so the newly cached contents will be served
const module = server?.moduleGraph.getModuleById(modulePath)
if (module) {
server?.moduleGraph.invalidateModule(module)
}

s.overwrite(
node.loc.start.offset,
node.loc.end.offset,
`<script type="module" src="${modulePath}"></script>`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if the type is css, this shouldn't be a script type="module", I think that's causing #7124.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but no module css, it generate code can't run

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

import {createHotContext as __vite__createHotContext} from "/@vite/client";
import.meta.hot = __vite__createHotContext("/dep.css");
import {updateStyle as __vite__updateStyle, removeStyle as __vite__removeStyle} from "/@vite/client"

)
}

await traverseHtml(html, htmlPath, (node) => {
if (node.type !== NodeTypes.ELEMENT) {
return
Expand All @@ -105,41 +135,18 @@ const devHtmlHook: IndexHtmlTransformHook = async (
// script tags
if (node.tag === 'script') {
const { src, isModule } = getScriptInfo(node)
if (isModule) {
scriptModuleIndex++
}

if (src) {
processNodeUrl(src, s, config, htmlPath, originalUrl, moduleGraph)
} else if (isModule) {
const url = filePath.replace(normalizePath(config.root), '')

const contents = node.children
.map((child: any) => child.content || '')
.join('')

// add HTML Proxy to Map
addToHTMLProxyCache(config, url, scriptModuleIndex, contents)

// inline js module. convert to src="proxy"
const modulePath = `${
config.base + htmlPath.slice(1)
}?html-proxy&index=${scriptModuleIndex}.js`

// invalidate the module so the newly cached contents will be served
const module = server?.moduleGraph.getModuleById(modulePath)
if (module) {
server?.moduleGraph.invalidateModule(module)
}

s.overwrite(
node.loc.start.offset,
node.loc.end.offset,
`<script type="module" src="${modulePath}"></script>`
)
addInlineModule(node, 'js')
}
}

if (node.tag === 'style' && node.children.length) {
addInlineModule(node, 'css')
}

// elements with [href/src] attrs
const assetAttrs = assetAttrsConfig[node.tag]
if (assetAttrs) {
Expand Down