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.

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

feat(ssr): include non-CSS assets in the manifest #3556

Merged
merged 4 commits into from
Jun 1, 2021
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
11 changes: 11 additions & 0 deletions packages/playground/ssr-vue/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
</template>

<style>
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 400;
font-display: swap;
src: url('./assets/fonts/Inter-Italic.woff2?#iefix') format('woff2'),
url('./assets/fonts/Inter-Italic.woff') format('woff');
}
.inter {
font-family: 'Inter';
}
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
Expand Down
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions packages/playground/ssr-vue/src/entry-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ function renderPreloadLink(file) {
return `<link rel="modulepreload" crossorigin href="${file}">`
} else if (file.endsWith('.css')) {
return `<link rel="stylesheet" href="${file}">`
} else if (file.endsWith('.woff')) {
return ` <link rel="preload" href="${file}" as="font" type="font/woff" crossorigin>`
} else if (file.endsWith('.woff2')) {
return ` <link rel="preload" href="${file}" as="font" type="font/woff2" crossorigin>`
} else if (file.endsWith('.gif')) {
return ` <link rel="preload" href="${file}" as="image" type="image/gif" crossorigin>`
} else if (file.endsWith('.jpg')) {
return ` <link rel="preload" href="${file}" as="image" type="image/jpeg" crossorigin>`
} else if (file.endsWith('.jpeg')) {
return ` <link rel="preload" href="${file}" as="image" type="image/jpeg" crossorigin>`
} else if (file.endsWith('.png')) {
return ` <link rel="preload" href="${file}" as="image" type="image/png" crossorigin>`
} else {
// TODO
return ''
Expand Down
1 change: 1 addition & 0 deletions packages/playground/ssr-vue/src/pages/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<button @click="state.count++">count is: {{ state.count }}</button>
<Foo />
<p class="virtual">msg from virtual module: {{ foo.msg }}</p>
<p class="inter">this will be styled with a font-face</p>

<ImportType />
</template>
Expand Down
22 changes: 16 additions & 6 deletions packages/vite/src/node/ssr/ssrManifestPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ResolvedConfig } from '..'
import { Plugin } from '../plugin'
import { chunkToEmittedCssFileMap } from '../plugins/css'
import { chunkToEmittedAssetsMap } from '../plugins/asset'

export function ssrManifestPlugin(config: ResolvedConfig): Plugin {
// module id => preload assets mapping
Expand All @@ -12,19 +13,28 @@ export function ssrManifestPlugin(config: ResolvedConfig): Plugin {
generateBundle(_options, bundle) {
for (const file in bundle) {
const chunk = bundle[file]
if (chunk.type === 'chunk' && !chunk.isEntry) {
// links for entry chunks are already generated in static HTML
// so we only need to record info for non-entry chunks
// TODO: also include non-CSS assets
const cssFiles = chunkToEmittedCssFileMap.get(chunk)
if (chunk.type === 'chunk') {
// links for certain entry chunks are already generated in static HTML
// in those cases we only need to record info for non-entry chunks
const cssFiles = chunk.isEntry
? null
: chunkToEmittedCssFileMap.get(chunk)
const assetFiles = chunkToEmittedAssetsMap.get(chunk)
for (const id in chunk.modules) {
const mappedChunks = ssrManifest[id] || (ssrManifest[id] = [])
mappedChunks.push(base + chunk.fileName)
if (!chunk.isEntry) {
mappedChunks.push(base + chunk.fileName)
}
if (cssFiles) {
cssFiles.forEach((file) => {
mappedChunks.push(base + file)
})
}
if (assetFiles) {
assetFiles.forEach((file) => {
mappedChunks.push(base + file)
})
}
}
}
}
Expand Down