fix: use content to read markdown files instead of pages (#362)

nuxt-themes · Jun 1, 2021 · 1c7b622 · 1c7b622 · vercel · Jun 1, 2021
1 parent 23571b1
commit 1c7b622
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 8 deletions.
diff --git a/docs/pages/1.get-started/1.installation.md → docs/content/1.get-started/1.installation.md b/docs/pages/1.get-started/1.installation.md → docs/content/1.get-started/1.installation.md
diff --git a/docs/pages/1.get-started/2.configuration.md → .../content/1.get-started/2.configuration.md b/docs/pages/1.get-started/2.configuration.md → .../content/1.get-started/2.configuration.md
diff --git a/docs/pages/2.usage/1.content.md → docs/content/2.usage/1.content.md b/docs/pages/2.usage/1.content.md → docs/content/2.usage/1.content.md
diff --git a/docs/pages/2.usage/2.components.md → docs/content/2.usage/2.components.md b/docs/pages/2.usage/2.components.md → docs/content/2.usage/2.components.md
diff --git a/docs/pages/2.usage/3.assets.md → docs/content/2.usage/3.assets.md b/docs/pages/2.usage/3.assets.md → docs/content/2.usage/3.assets.md
diff --git a/docs/pages/2.usage/4.template.md → docs/content/2.usage/4.template.md b/docs/pages/2.usage/4.template.md → docs/content/2.usage/4.template.md
diff --git a/docs/pages/2.usage/_5.admin.md → docs/content/2.usage/_5.admin.md b/docs/pages/2.usage/_5.admin.md → docs/content/2.usage/_5.admin.md
diff --git a/docs/pages/2.usage/_example.md → docs/content/2.usage/_example.md b/docs/pages/2.usage/_example.md → docs/content/2.usage/_example.md
diff --git a/docs/pages/3.more/1.example.md → docs/content/3.more/1.example.md b/docs/pages/3.more/1.example.md → docs/content/3.more/1.example.md
diff --git a/docs/pages/3.more/2.showcases.md → docs/content/3.more/2.showcases.md b/docs/pages/3.more/2.showcases.md → docs/content/3.more/2.showcases.md
diff --git a/docs/pages/3.more/3.deployment.md → docs/content/3.more/3.deployment.md b/docs/pages/3.more/3.deployment.md → docs/content/3.more/3.deployment.md
diff --git a/docs/pages/3.more/4.migration.md → docs/content/3.more/4.migration.md b/docs/pages/3.more/4.migration.md → docs/content/3.more/4.migration.md
diff --git a/docs/pages/3.more/5.extend.md → docs/content/3.more/5.extend.md b/docs/pages/3.more/5.extend.md → docs/content/3.more/5.extend.md
diff --git a/docs/pages/blog/0.index.md → docs/content/blog/0.index.md b/docs/pages/blog/0.index.md → docs/content/blog/0.index.md
diff --git a/...build-dev-to-clone-with-nuxt-new-fetch.md → ...build-dev-to-clone-with-nuxt-new-fetch.md b/...build-dev-to-clone-with-nuxt-new-fetch.md → ...build-dev-to-clone-with-nuxt-new-fetch.md
diff --git a/docs/pages/blog/creating-a-nuxt-module.md → docs/content/blog/creating-a-nuxt-module.md b/docs/pages/blog/creating-a-nuxt-module.md → docs/content/blog/creating-a-nuxt-module.md
diff --git a/...s/blog/creating-blog-with-nuxt-content.md → ...t/blog/creating-blog-with-nuxt-content.md b/...s/blog/creating-blog-with-nuxt-content.md → ...t/blog/creating-blog-with-nuxt-content.md
diff --git a/docs/pages/index.md → docs/content/index.md b/docs/pages/index.md → docs/content/index.md
diff --git a/docs/pages/releases.md → docs/content/releases.md b/docs/pages/releases.md → docs/content/releases.md
diff --git a/docs/pages/templates/pre-launch.md → docs/content/templates/pre-launch.md b/docs/pages/templates/pre-launch.md → docs/content/templates/pre-launch.md
diff --git a/src/core/module.ts b/src/core/module.ts
@@ -28,7 +28,7 @@ function isUrl(string) {
 
 export default <Module>async function docusModule() {
   // Wait for nuxt options to be normalized
-  const { nuxt, addServerMiddleware, addPlugin, addModule } = this
+  const { nuxt, addServerMiddleware, addPlugin, addModule, $docus } = this
   const { options } = nuxt
   const isSSG = options.dev === false && (options.target === 'static' || options._generate || options.mode === 'spa')
 
@@ -89,7 +89,7 @@ export default <Module>async function docusModule() {
   const { storage, lazyIndex } = initStorage({
     drivers: [
       {
-        base: resolve(options.srcDir, options.dir.pages),
+        base: resolve(options.srcDir, $docus.settings.contentDir),
         mountPoint: 'pages'
       },
       {

diff --git a/src/core/storage.ts b/src/core/storage.ts
@@ -19,11 +19,6 @@ export const docusDriver = defineDriver((options: DriverOptions) => {
     // unify key format
     key = key.replace(/\//g, ':')
 
-    // ignore vue files
-    if (key.endsWith('.vue')) {
-      return null
-    }
-
     const document = await parser.parse(key, content)
 
     if (document.extension === '.md') {

diff --git a/src/settings/defaults.ts b/src/settings/defaults.ts
@@ -2,7 +2,7 @@ import { DocusSettings } from '../types'
 
 export const docusDefaults: DocusSettings = {
   title: 'Docus',
-  contentDir: 'pages',
+  contentDir: 'content',
   url: '',
   description: '',
   template: 'docs',