fix(kit): move relative path handling back into nuxt templates (#6430)

packages/kit/package.json

@@ -24,7 +24,6 @@
  "knitwork": "^0.1.2",
  "lodash.template": "^4.5.0",
  "mlly": "^0.5.7",
- "ohash": "^0.1.5",
  "pathe": "^0.3.3",
  "pkg-types": "^0.3.3",
  "scule": "^0.3.2",

packages/kit/src/internal/template.ts

@@ -3,8 +3,6 @@ import lodashTemplate from 'lodash.template'
 import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork'
 
 import type { NuxtTemplate } from '@nuxt/schema'
-import { relative } from 'pathe'
-import { hash } from 'ohash'
 
 export async function compileTemplate (template: NuxtTemplate, ctx: any) {
  const data = { ...ctx, options: template.options }
@@ -23,27 +21,24 @@ export async function compileTemplate (template: NuxtTemplate, ctx: any) {
  throw new Error('Invalid template: ' + JSON.stringify(template))
 }
 
+/** @deprecated */
 const serialize = (data: any) => JSON.stringify(data, null, 2).replace(/"{(.+)}"(?=,?$)/gm, r => JSON.parse(r).replace(/^{(.*)}$/, '$1'))
 
-const importSources = (sources: string | string[], root: string, { lazy = false } = {}) => {
+/** @deprecated */
+const importSources = (sources: string | string[], { lazy = false } = {}) => {
  if (!Array.isArray(sources)) {
  sources = [sources]
  }
- const exports: string[] = []
- const imports: string[] = []
- for (const src of sources) {
- const path = relative(root, src)
- const variable = genSafeVariableName(path).replace(/_(45|46|47)/g, '_') + '_' + hash(path)
- exports.push(variable)
- imports.push(lazy
- ? `const ${variable} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`
- : genImport(src, variable)
- )
- }
- return {
- exports,
- imports
- }
+ return sources.map((src) => {
+ if (lazy) {
+ return `const ${genSafeVariableName(src)} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`
+ }
+ return genImport(src, genSafeVariableName(src))
+ }).join('\n')
 }
 
-export const templateUtils = { serialize, importName: genSafeVariableName, importSources }
+/** @deprecated */
+const importName = genSafeVariableName
+
+/** @deprecated */
+export const templateUtils = { serialize, importName, importSources }

packages/nuxt/src/core/templates.ts

@@ -1,10 +1,10 @@
-import { templateUtils } from '@nuxt/kit'
 import type { Nuxt, NuxtApp, NuxtTemplate } from '@nuxt/schema'
 import { genArrayFromRaw, genDynamicImport, genExport, genImport, genObjectFromRawEntries, genString, genSafeVariableName } from 'knitwork'
 
 import { isAbsolute, join, relative } from 'pathe'
 import { resolveSchema, generateTypes } from 'untyped'
 import escapeRE from 'escape-string-regexp'
+import { hash } from 'ohash'
 
 export interface TemplateContext {
  nuxt: Nuxt
@@ -48,8 +48,14 @@ export const clientPluginTemplate = {
  filename: 'plugins/client.mjs',
  getContents (ctx: TemplateContext) {
  const clientPlugins = ctx.app.plugins.filter(p => !p.mode || p.mode !== 'server')
- const rootDir = ctx.nuxt.options.rootDir
- const { imports, exports } = templateUtils.importSources(clientPlugins.map(p => p.src), rootDir)
+ const exports: string[] = []
+ const imports: string[] = []
+ for (const plugin of clientPlugins) {
+ const path = relative(ctx.nuxt.options.rootDir, plugin.src)
+ const variable = genSafeVariableName(path).replace(/_(45|46|47)/g, '_') + '_' + hash(path)
+ exports.push(variable)
+ imports.push(genImport(plugin.src, variable))
+ }
  return [
  ...imports,
  `export default ${genArrayFromRaw(exports)}`
@@ -61,15 +67,17 @@ export const serverPluginTemplate = {
  filename: 'plugins/server.mjs',
  getContents (ctx: TemplateContext) {
  const serverPlugins = ctx.app.plugins.filter(p => !p.mode || p.mode !== 'client')
- const rootDir = ctx.nuxt.options.rootDir
- const { imports, exports } = templateUtils.importSources(serverPlugins.map(p => p.src), rootDir)
+ const exports: string[] = ['preload']
+ const imports: string[] = ["import preload from '#app/plugins/preload.server'"]
+ for (const plugin of serverPlugins) {
+ const path = relative(ctx.nuxt.options.rootDir, plugin.src)
+ const variable = genSafeVariableName(path).replace(/_(45|46|47)/g, '_') + '_' + hash(path)
+ exports.push(variable)
+ imports.push(genImport(plugin.src, variable))
+ }
  return [
- "import preload from '#app/plugins/preload.server'",
  ...imports,
- `export default ${genArrayFromRaw([
- 'preload',
- ...exports
- ])}`
+ `export default ${genArrayFromRaw(exports)}`
  ].join('\n')
  }
 }

yarn.lock

@@ -1736,7 +1736,6 @@ __metadata:
  knitwork: ^0.1.2
  lodash.template: ^4.5.0
  mlly: ^0.5.7
- ohash: ^0.1.5
  pathe: ^0.3.3
  pkg-types: ^0.3.3
  scule: ^0.3.2