feat: some enhancements

Author: ulivz

CHANGELOG.md

@@ -23,47 +23,20 @@
 
 * **$core:** support global layout (close: [#1226](https://github.com/vuejs/vuepress/issues/1226)) ([c91f55a](https://github.com/vuejs/vuepress/commit/c91f55a))
 
-  From now on, users have the ability to use a custom global layout component via [siteConfig](https://vuepress.vuejs.org/miscellaneous/glossary.html#siteconfig) or [themeEntryFile](https://vuepress.vuejs.org/miscellaneous/glossary.html#themeentryfile):
+  From now on, users have the ability to use a custom global layout component via [siteConfig](https://vuepress.vuejs.org/miscellaneous/glossary.html#siteconfig) or [themeEntry](https://vuepress.vuejs.org/miscellaneous/glossary.html#themeentry):
 
   ```js
   module.exports = {
     globalLayout: '/path/to/your/global/vue/sfc'
   }
   ```
 
-  Here is the [content of default global layout component](https://github.com/vuejs/vuepress/blob/master/packages/%40vuepress/core/lib/app/components/GlobalLayout.vue), an example of setting global header and footer:
-  
-  ```vue
-  <template>
-    <div id="global-layout">
-      <header><h1>Header</h1></header>
-      <component :is="layout"/>
-      <footer><h1>Footer</h1></footer>
-    </div>
-  </template>
-  
-  <script>
-  export default {
-    computed: {
-      layout () {
-        if (this.$page.path) {
-          if (this.$vuepress.isLayoutExists(this.$page.frontmatter.layout)) {
-            return this.$page.frontmatter.layout
-          }
-          return 'Layout'
-        }
-        return 'NotFound'
-      }
-    }
-  }
-  </script>
-  ```
-  
+  Here is the [content of default global layout component](https://github.com/vuejs/vuepress/blob/master/packages/%40vuepress/core/lib/app/components/GlobalLayout.vue), 
   Also, you can follow the convention, directly create a component `.vuepress/components/GlobalLayout.vue` or `themePath/layouts/GlobalLayout.vue` without any config. the loading priority is as follows: 
 
   - siteConfig
   - siteAgreement
-  - themeEntryFile
+  - themeEntry
   - themeAgreement
   - default
 

packages/@vuepress/core/lib/internal-plugins/enhanceApp.js

@@ -6,14 +6,12 @@ module.exports = (options, context) => ({
   enhanceAppFiles () {
     const { sourceDir, themeAPI } = context
     const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
-    const themeEnhanceAppPath = path.resolve(themeAPI.theme.path, 'enhanceApp.js')
-    const files = [
-      enhanceAppPath,
-      themeEnhanceAppPath
-    ]
+    const files = [enhanceAppPath]
     if (themeAPI.existsParentTheme) {
       files.push(path.resolve(themeAPI.parentTheme.path, 'enhanceApp.js'))
     }
+    const themeEnhanceAppPath = path.resolve(themeAPI.theme.path, 'enhanceApp.js')
+    files.push(themeEnhanceAppPath)
     return files
   }
 })

packages/@vuepress/core/lib/plugin-api/index.js

@@ -84,7 +84,11 @@ module.exports = class PluginAPI {
     if (isPlainObject(pluginRaw) && pluginRaw.$$normalized) {
       plugin = pluginRaw
     } else {
-      plugin = this.normalizePlugin(pluginRaw, pluginOptions)
+      try {
+        plugin = this.normalizePlugin(pluginRaw, pluginOptions)
+      } catch (e) {
+        logger.warn(e.message)
+      }
     }
 
     if (plugin.multiple !== true) {
@@ -114,8 +118,7 @@ module.exports = class PluginAPI {
   normalizePlugin (pluginRaw, pluginOptions = {}) {
     let plugin = this._pluginResolver.resolve(pluginRaw)
     if (!plugin.entry) {
-      console.warn(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
-      return this
+      throw new Error(`[vuepress] cannot resolve plugin "${pluginRaw}"`)
     }
     plugin = flattenPlugin(plugin, pluginOptions, this._pluginContext, this)
     plugin.$$normalized = true

packages/@vuepress/core/lib/prepare/AppContext.js

@@ -252,14 +252,12 @@ module.exports = class AppContext {
    */
 
   resolveGlobalLayout () {
-    const GLOBAL_LAYOUT_COMPONENT_NAME = `GlobalLayout`
-
     this.globalLayout = this.resolveCommonAgreementFilePath(
       'globalLayout',
       {
-        defaultValue: path.resolve(__dirname, `../app/components/${GLOBAL_LAYOUT_COMPONENT_NAME}.vue`),
-        siteAgreement: `components/${GLOBAL_LAYOUT_COMPONENT_NAME}.vue`,
-        themeAgreement: `layouts/${GLOBAL_LAYOUT_COMPONENT_NAME}.vue`
+        defaultValue: path.resolve(__dirname, `../app/components/GlobalLayout.vue`),
+        siteAgreement: `components/GlobalLayout.vue`,
+        themeAgreement: `layouts/GlobalLayout.vue`
       }
     )
 

packages/@vuepress/core/lib/prepare/loadTheme.js

@@ -37,6 +37,7 @@ module.exports = function loadTheme (ctx) {
   if (!theme.path) {
     throw new Error(`[vuepress] You must specify a theme, or create a local custom theme. \n For more details, refer to https://vuepress.vuejs.org/guide/custom-themes.html#custom-themes. \n`)
   }
+  logger.tip(`Apply theme ${chalk.gray(theme.name)}`)
   theme.entry.name = '@vuepress/internal-theme-entry-file'
 
   let parentTheme = {}
@@ -45,14 +46,22 @@ module.exports = function loadTheme (ctx) {
     parentTheme.entry.name = '@vuepress/internal-parent-theme-entry-file'
   }
 
+  logger.debug('theme', theme.name, theme.path)
+  logger.debug('parentTheme', parentTheme.name, parentTheme.path)
   return new ThemeAPI(theme, parentTheme, ctx)
 }
 
 function normalizeThemePath (resolved) {
   const { entry, name, fromDep } = resolved
   if (fromDep) {
     const pkgPath = require.resolve(name)
-    return parse(pkgPath).dir
+    let packageRootDir = parse(pkgPath).dir
+    // For those cases that "main" field was set to non-index file
+    // e.g. `layouts/Layout.vue`
+    while (!fs.existsSync(`${packageRootDir}/package.json`)) {
+      packageRootDir = resolve(packageRootDir, '..')
+    }
+    return packageRootDir
   } else if (entry.endsWith('.js') || entry.endsWith('.vue')) {
     return parse(entry).dir
   } else {
@@ -89,7 +98,6 @@ function resolveTheme (ctx, resolver, ignoreLocal, theme) {
     path = normalizeThemePath(resolved)
     name = resolved.name
     shortcut = resolved.shortcut
-    logger.tip(`Apply theme ${chalk.gray(name)}`)
   } else {
     return {}
   }

packages/@vuepress/theme-blog/components/Home.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <header>Header</header>
+    <Content/>
+    <footer>Footer</footer>
+  </div>
+</template>
+
+<style>
+
+</style>

packages/@vuepress/theme-blog/layouts/Layout.vue renamed to packages/@vuepress/theme-blog/layouts/Layout2.vue

@@ -76,7 +76,9 @@ module.exports = ctx => ({
       ga: 'UA-128189152-1'
     }],
   ],
-  clientRootMixin: path.resolve(__dirname, 'mixin.js'),
+  clientRootMixin: ctx.isProd
+    ? path.resolve(__dirname, 'mixin.js')
+    : [],
   extendMarkdown (md) {
     md.use(container, 'upgrade', {
       render: (tokens, idx) => tokens[idx].nesting === 1
@@ -161,7 +163,8 @@ function getThemeSidebar (groupA, introductionA) {
         'using-a-theme',
         'writing-a-theme',
         'option-api',
-        'default-theme-config'
+        'default-theme-config',
+        'inheritance'
       ]
     },
   ]

packages/@vuepress/theme-vue/components/Home.vue

@@ -56,7 +56,7 @@ Value of `themeConfig` in `.vuepress/config.js`, i.e., `user's theme configurati
 
 Root path (absolute path) of the currently used theme.
 
-## themeEntryFile
+## themeEntry
 
 > Access: `Context.themeAPI.theme.entry`
 

packages/docs/docs/.vuepress/config.js

@@ -0,0 +1,9 @@
+# Theme Inheritance
+
+## Motivation
+
+
+
+## What is Subject Inheritance?
+
+

packages/docs/docs/miscellaneous/glossary.md

@@ -32,3 +32,4 @@ Note that in the child theme, VuePress will apply a `@parent-theme` [alias](../p
 
 - [Example: `@vuepress/theme-vue`](https://github.com/vuejs/vuepress/tree/master/packages/@vuepress/theme-vue)
 - [Design Concepts of VuePress 1.x](../miscellaneous/design-concepts.md)
+