Skip to content

Commit

Permalink
fix: remove (now deprecated) template utils (#1423)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe authored and farnabaz committed Sep 7, 2022
1 parent 333f33e commit 84e32a0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"detab": "^3.0.1",
"html-tags": "^3.2.0",
"json5": "^2.2.1",
"knitwork": "^0.1.2",
"listhen": "^0.2.13",
"mdast-util-to-hast": "^12.2.0",
"mdurl": "^1.0.1",
Expand Down
14 changes: 9 additions & 5 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import {
createResolver,
addAutoImport,
addComponentsDir,
templateUtils,
addTemplate
} from '@nuxt/kit'
import { genImport, genSafeVariableName } from 'knitwork'
import type { ListenOptions } from 'listhen'
// eslint-disable-next-line import/no-named-as-default
import defu from 'defu'
import { hash } from 'ohash'
import { join } from 'pathe'
import { join, relative } from 'pathe'
import type { Lang as ShikiLang, Theme as ShikiTheme } from 'shiki-es'
import { listen } from 'listhen'
import type { WatchEvent } from 'unstorage'
Expand Down Expand Up @@ -308,11 +308,15 @@ export default defineNuxtModule<ModuleOptions>({
nitroConfig.alias = nitroConfig.alias || {}
nitroConfig.alias['#content/server'] = resolveRuntimeModule('./server')

const transformers = contentContext.transformers.map((t) => {
const name = genSafeVariableName(relative(nuxt.options.rootDir, t)).replace(/_(45|46|47)/g, '_') + '_' + hash(t)
return { name, import: genImport(t, name) }
})

nitroConfig.virtual = nitroConfig.virtual || {}
nitroConfig.virtual['#content/virtual/transformers'] = [
// TODO: remove kit usage
templateUtils.importSources(contentContext.transformers),
`export const transformers = [${contentContext.transformers.map(templateUtils.importName).join(', ')}]`,
...transformers.map(t => t.import),
`export const transformers = [${transformers.map(t => t.name).join(', ')}]`,
'export const getParser = (ext) => transformers.find(p => ext.match(new RegExp(p.extensions.join("|"), "i")) && p.parse)',
'export const getTransformers = (ext) => transformers.filter(p => ext.match(new RegExp(p.extensions.join("|"), "i")) && p.transform)',
'export default () => {}'
Expand Down

0 comments on commit 84e32a0

Please sign in to comment.