Merge branch 'develop' into snyk-fix-3ec1f5a2835b0c7ec854adb3461e3a96

docsifyjs · Aug 13, 2020 · e58992f · e58992f
2 parents cf80416 + f7be0b0
commit e58992f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/cypress/fixtures/tpl/docs.index.html b/cypress/fixtures/tpl/docs.index.html
@@ -28,7 +28,7 @@
       alias: {
         '.*?/awesome':
           'https://raw.githubusercontent.com/docsifyjs/awesome-docsify/master/README.md',
-        '.*?/changelog':
+        '/changelog':
           'https://raw.githubusercontent.com/docsifyjs/docsify/master/CHANGELOG.md',
         '/.*/_navbar.md': '/_navbar.md',
         '/zh-cn/(.*)':
@@ -40,6 +40,7 @@
         '/es/(.*)':
           'https://raw.githubusercontent.com/docsifyjs/docs-es/master/$1'
       },
+      fallbackLanguages: ['es'],
       auto2top: true,
       coverpage: true,
       executeScript: true,

diff --git a/cypress/integration/routing/fallback.spec.js b/cypress/integration/routing/fallback.spec.js
@@ -0,0 +1,9 @@
+context('config.fallbackLanguages', () => {
+  it('fallbacks respecting aliases', () => {
+    cy.visit('http://localhost:3000/#/es/');
+
+    cy.get('.sidebar-nav').contains('Changelog').click();
+
+    cy.get('#main').should('contain', 'Bug Fixes');
+  })
+});
diff --git a/docs/cdn.md b/docs/cdn.md
@@ -44,7 +44,7 @@ Alternatively, use [compressed files](#compressed-file).
 
 ## Other CDN
 
-- http://www.bootcdn.cn/docsify
+- https://www.bootcdn.cn/docsify/
 - https://cdn.jsdelivr.net/npm/docsify/
 - https://cdnjs.com/libraries/docsify
-
+- https://unpkg.com/browse/docsify/
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/docsify-server-renderer/package-lock.json b/packages/docsify-server-renderer/package-lock.json
diff --git a/src/core/fetch/index.js b/src/core/fetch/index.js
@@ -123,7 +123,7 @@ export function fetchMixin(proto) {
           this._loadSideAndNav(path, qs, loadSidebar, cb)
         ),
       _ => {
-        this._fetchFallbackPage(file, qs, cb) || this._fetch404(file, qs, cb);
+        this._fetchFallbackPage(path, qs, cb) || this._fetch404(file, qs, cb);
       }
     );
 
@@ -209,7 +209,9 @@ export function fetchMixin(proto) {
       return false;
     }
 
-    const newPath = path.replace(new RegExp(`^/${local}`), '');
+    const newPath = this.router.getFile(
+      path.replace(new RegExp(`^/${local}`), '')
+    );
     const req = request(newPath + qs, true, requestHeaders);
 
     req.then(