Revert "Support filename that contains non-ASCII and unicode chars (#473

)"

This reverts commit 95a3548.

docs/README.md

@@ -15,8 +15,6 @@ footer: MIT Licensed | Copyright © 2018-present Evan You
 
 ### As Easy as 1, 2, 3
 
-- [尤](./尤.md)
-
 ``` bash
 # install
 yarn global add vuepress # OR npm install -g vuepress

lib/app/Content.js

@@ -1,3 +1,5 @@
+import { pathToComponentName } from './util'
+
 export default {
   functional: true,
 
@@ -9,7 +11,7 @@ export default {
   },
 
   render (h, { parent, props, data }) {
-    return h(parent.$page.key, {
+    return h(pathToComponentName(parent.$page.path), {
       class: [props.custom ? 'custom' : '', data.class, data.staticClass],
       style: data.style
     })

lib/app/util.js

@@ -5,6 +5,14 @@ export function injectMixins (options, mixins) {
   options.mixins.push(...mixins)
 }
 
+export function pathToComponentName (path) {
+  if (path.charAt(path.length - 1) === '/') {
+    return `page${path.replace(/\//g, '-') + 'index'}`
+  } else {
+    return `page${path.replace(/\//g, '-').replace(/\.html$/, '')}`
+  }
+}
+
 export function findPageForPath (pages, path) {
   for (let i = 0; i < pages.length; i++) {
     const page = pages[i]

lib/build.js

@@ -153,7 +153,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
       console.error(chalk.red(`Error rendering ${pagePath}:`))
       throw e
     }
-    const filename = decodeURIComponent(pagePath.replace(/\/$/, '/index.html').replace(/^\//, ''))
+    const filename = pagePath.replace(/\/$/, '/index.html').replace(/^\//, '')
     const filePath = path.resolve(outDir, filename)
     await fs.ensureDir(path.dirname(filePath))
     await fs.writeFile(filePath, html)

lib/default-theme/Layout.vue

@@ -27,6 +27,7 @@ import Home from './Home.vue'
 import Navbar from './Navbar.vue'
 import Page from './Page.vue'
 import Sidebar from './Sidebar.vue'
+import { pathToComponentName } from '@app/util'
 import { resolveSidebarItems } from './util'
 
 export default {
@@ -85,13 +86,11 @@ export default {
   },
 
   mounted () {
-    window.addEventListener('scroll', this.onScroll)
-
     // configure progress bar
     nprogress.configure({ showSpinner: false })
 
     this.$router.beforeEach((to, from, next) => {
-      if (to.path !== from.path && !Vue.component(to.name)) {
+      if (to.path !== from.path && !Vue.component(pathToComponentName(to.path))) {
         nprogress.start()
       }
       next()

lib/prepare.js

@@ -5,7 +5,6 @@ const createMarkdown = require('./markdown')
 const loadConfig = require('./util/loadConfig')
 const tempPath = path.resolve(__dirname, 'app/.temp')
 const {
-  encodePath,
   inferTitle,
   extractHeaders,
   parseFrontmatter,
@@ -182,10 +181,8 @@ async function resolveOptions (sourceDir) {
   // resolve pagesData
   const pagesData = await Promise.all(pageFiles.map(async (file) => {
     const filepath = path.resolve(sourceDir, file)
-    const key = 'v-' + Math.random().toString(16).slice(2)
     const data = {
-      key,
-      path: encodePath(fileToPath(file))
+      path: fileToPath(file)
     }
 
     if (shouldResolveLastUpdated) {
@@ -299,31 +296,21 @@ async function resolveComponents (sourceDir) {
 }
 
 async function genRoutesFile ({ siteData: { pages }, sourceDir, pageFiles }) {
-  function genRoute ({ path: pagePath, key: componentName }, index) {
+  function genRoute ({ path: pagePath }, index) {
     const file = pageFiles[index]
     const filePath = path.resolve(sourceDir, file)
     let code = `
   {
-    name: ${JSON.stringify(componentName)},
     path: ${JSON.stringify(pagePath)},
     component: ThemeLayout,
     beforeEnter: (to, from, next) => {
       import(${JSON.stringify(filePath)}).then(comp => {
-        Vue.component(${JSON.stringify(componentName)}, comp.default)
+        Vue.component(${JSON.stringify(fileToComponentName(file))}, comp.default)
         next()
       })
     }
   }`
 
-    const dncodedPath = decodeURIComponent(pagePath)
-    if (dncodedPath !== pagePath) {
-      code += `,
-  {
-    path: ${JSON.stringify(dncodedPath)},
-    redirect: ${JSON.stringify(pagePath)}
-  }`
-    }
-
     if (/\/$/.test(pagePath)) {
       code += `,
   {

lib/util/index.js

@@ -1,10 +1,6 @@
 const spawn = require('cross-spawn')
 const parseHeaders = require('./parseHeaders')
 
-exports.encodePath = function (path) {
-  return path.split('/').map(item => encodeURIComponent(item)).join('/')
-}
-
 exports.parseHeaders = parseHeaders
 
 exports.normalizeHeadTag = tag => {