Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-19 01:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nitro): use nuxt2 compatible template (#268)

Browse Source 
closes #265
This commit is contained in:
Daniel Roe 2021-06-24 12:35:21 +01:00 committed by GitHub
parent 9797642d78
commit c399f142b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/_templates/views/app.template.html
View File

@ -4,9 +4,7 @@
{{ HEAD }} {{ HEAD }}
</head> </head>
<body {{ BODY_ATTRS }}> <body {{ BODY_ATTRS }}>
{{ BODY_SCRIPTS_PREPEND }}
{{ APP }} {{ APP }}
{{ BODY_SCRIPTS }}
<% if (nuxt.options.vite && nuxt.options.dev) { %><script type="module" src="/@vite/client"></script> <% if (nuxt.options.vite && nuxt.options.dev) { %><script type="module" src="/@vite/client"></script>
<script type="module" src="/entry.mjs"></script><% } %> <script type="module" src="/entry.mjs"></script><% } %>
</body> </body>

8
packages/nitro/src/compat.ts
View File

@ -53,14 +53,6 @@ export default function nuxt2CompatModule () {
serverConfig.devtool = false serverConfig.devtool = false
}) })
// Add missing template variables (which normally renderer would create)
nitroContext._internal.hooks.hook('nitro:document', (htmlTemplate) => {
if (!htmlTemplate.contents.includes('BODY_SCRIPTS_PREPEND')) {
const fullTemplate = ['{{ BODY_SCRIPTS_PREPEND }}', '{{ APP }}', '{{ BODY_SCRIPTS }}'].join('\n ')
htmlTemplate.contents = htmlTemplate.contents.replace('{{ APP }}', fullTemplate)
}
})
// Nitro client plugin // Nitro client plugin
this.addPlugin({ this.addPlugin({
fileName: 'nitro.client.js', fileName: 'nitro.client.js',

4
packages/nitro/src/runtime/app/render.ts
View File

@ -121,9 +121,7 @@ function renderHTML (payload, rendered, ssrContext) {
HEAD: meta.headTags + HEAD: meta.headTags +
rendered.renderResourceHints() + rendered.renderStyles() + (ssrContext.styles || ''), rendered.renderResourceHints() + rendered.renderStyles() + (ssrContext.styles || ''),
BODY_ATTRS: meta.bodyAttrs, BODY_ATTRS: meta.bodyAttrs,
BODY_SCRIPTS_PREPEND: meta.bodyScriptsPrepend, APP: meta.bodyScriptsPrepend + _html + state + rendered.renderScripts() + meta.bodyScripts
APP: _html + state + rendered.renderScripts(),
BODY_SCRIPTS: meta.bodyScripts
}) })
} }