refactor: root mixins injection (#423)

vuejs · May 12, 2018 · 3727153 · 3727153
1 parent 21f939f
commit 3727153
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git 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
diff --git 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]`
   )
 }