diff --git a/lib/app/util.js b/lib/app/util.js index e1229ad1..ceafb220 100644 --- a/lib/app/util.js +++ b/lib/app/util.js @@ -1,3 +1,10 @@ +export function injectMixins (options, mixins) { + if (!options.mixins) { + options.mixins = [] + } + options.mixins.push(...mixins) +} + export function pathToComponentName (path) { if (path.charAt(path.length - 1) === '/') { return `page${path.replace(/\//g, '-') + 'index'}` diff --git a/lib/code/injectRootMixins.js b/lib/code/injectRootMixins.js deleted file mode 100644 index c5b7a7ed..00000000 --- a/lib/code/injectRootMixins.js +++ /dev/null @@ -1,8 +0,0 @@ -/* eslint-disable */ -import rootMixins from '@app/root-mixins' -function injectRootMixins (options) { - if (!options.mixins) { - options.mixins = [] - } - options.mixins.push(...rootMixins) -} diff --git a/lib/prepare.js b/lib/prepare.js index 67e3ca84..280314f1 100644 --- a/lib/prepare.js +++ b/lib/prepare.js @@ -342,14 +342,13 @@ async function genRoutesFile ({ siteData: { pages }, sourceDir, pageFiles }) { component: ThemeNotFound }` - const injectRootMixins = await fs.readFile(path.resolve(__dirname, 'code/injectRootMixins.js'), 'utf-8') - return ( `import ThemeLayout from '@themeLayout'\n` + - `import ThemeNotFound from '@themeNotFound'\n\n` + - `${injectRootMixins}\n` + - `injectRootMixins(ThemeLayout)\n` + - `injectRootMixins(ThemeNotFound)\n\n` + + `import ThemeNotFound from '@themeNotFound'\n` + + `import { injectMixins } from '@app/util'\n` + + `import rootMixins from '@app/root-mixins'\n\n` + + `injectMixins(ThemeLayout, rootMixins)\n` + + `injectMixins(ThemeNotFound, rootMixins)\n\n` + `export const routes = [${pages.map(genRoute).join(',')}${notFoundRoute}\n]` ) }