Merge branch 'develop' into patch-2

Author: sy-records

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,47 +1,65 @@
-<!-- Please use English language -->
-<!-- Please don't delete this template -->
+<!--
+  PULL REQUEST TEMPLATE
+  ---
+  Please use English language
+  Please don't delete this template
+  ---
+  Update "[ ]" to "[x]" to check a box in any list below.
+  ---
+  To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.
+-->
 
-<!-- PULL REQUEST TEMPLATE -->
-<!-- (Update "[ ]" to "[x]" to check a box) -->
+## **Summary**
 
-**Summary**
+<!--
+ THIS IS REQUIRED! Please describe what the change does and why it should be merged.
+-->
 
-**What kind of change does this PR introduce?** (check at least one)
+<!--
+  If changing the UI in any way, please provide the a **before/after** screenshot:
+-->
 
-- [ ] Bugfix
-- [ ] Feature
-- [ ] Code style update
-- [ ] Refactor
-- [ ] Docs
-- [ ] Build-related changes
-- [ ] Repo settings
-- [ ] Other, please describe:
+## **What kind of change does this PR introduce?**
 
-If changing the UI of default theme, please provide the **before/after** screenshot:
+<!--
+  Copy/paste one of the following options:
+-->
 
-**Does this PR introduce a breaking change?** (check one)
+<!--
+  Bugfix
+  Feature
+  Code style update
+  Refactor
+  Docs
+  Build-related changes
+  Repo settings
+  Other
+-->
+
+<!--
+  If you chose Other, please describe.
+-->
+
+## **For any code change,**
+
+- [ ] Related documentation has been updated if needed
+- [ ] Related tests have been updated or tests have been added
+
+## **Does this PR introduce a breaking change?** (check one)
 
 - [ ] Yes
 - [ ] No
 
 If yes, please describe the impact and migration path for existing applications:
 
-**The PR fulfills these requirements:**
+## **Related issue, if any:**
 
-- [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix #xxx[,#xxx]`, where "xxx" is the issue number)
+<!-- Paste issue's link or number hashtag here. -->
 
-You have tested in the following browsers: (Providing a detailed version will be better.)
+## **Tested in the following browsers:**
 
 - [ ] Chrome
 - [ ] Firefox
 - [ ] Safari
 - [ ] Edge
 - [ ] IE
-
-If adding a **new feature**, the PR's description includes:
-
-- [ ] A convincing reason for adding this feature
-- [ ] Related documents have been updated
-- [ ] Related tests have been updated
-
-To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
         run: npm run test:unit -- -ci --runInBand
       - name: integration tests
         run: npm run test:integration -- -ci --runInBand
-      - uses: microsoft/playwright-github-action@v1.3.0
+      - uses: microsoft/playwright-github-action@v1
       - name: e2e tests
         run: npm run test:e2e -- --ci --runInBand
       - name: Upload artifacts (diff output)

docs/deploy.md

@@ -88,11 +88,11 @@ When using the HTML5 router, you need to set up redirect rules that redirect all
 /*    /index.html   200
 ```
 
-## ZEIT Now
+## Vercel
 
-1. Install [Now CLI](https://zeit.co/download), `npm i -g now`
+1. Install [Vercel CLI](https://vercel.com/download), `npm i -g vercel`
 2. Change directory to your docsify website, for example `cd docs`
-3. Deploy with a single command, `now` 
+3. Deploy with a single command, `vercel`
 
 ## AWS Amplify
 

docs/embed-files.md

@@ -73,6 +73,11 @@ Example:
 
 If you embed the file as `iframe`, `audio` and `video`, then you may need to set the attributes of these tags.
 
+?> Note, for the `audio` and `video` types, docsify adds the `controls` attribute by default. When you want add more attributes, the `controls` attribute need to be added manually if need be.  
+```md
+[filename](_media/example.mp4 ':include :type=video controls width=100%')
+```
+
 ```markdown
 [cinwell website](https://cinwell.com ':include :type=iframe width=100% height=400px')
 ```

docs/index.html

@@ -111,6 +111,7 @@
             '/zh-cn/': '搜索',
             '/': 'Search',
           },
+          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
         },
         vueComponents: {
           'button-counter': {
@@ -179,7 +180,7 @@
                   .replace('@master', '/blob/master');
               } else {
                 url =
-                  'https://github.com/docsifyjs/docsify/blob/master/docs/' +
+                  'https://github.com/docsifyjs/docsify/blob/develop/docs/' +
                   vm.route.file;
               }
               var editHtml = '[:memo: Edit Document](' + url + ')\n';

docs/plugins.md

@@ -187,6 +187,8 @@ Pagination for docsify. By [@imyelo](https://github.com/imyelo)
 <script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
 ```
 
+Click [here](https://github.com/imyelo/docsify-pagination#readme) to get more information.
+
 ## Tabs
 
 A docsify.js plugin for displaying tabbed content from markdown.

index.html

@@ -91,7 +91,7 @@
                   .replace('@master', '/blob/master');
               } else {
                 url =
-                  'https://github.com/docsifyjs/docsify/blob/master/docs/' +
+                  'https://github.com/docsifyjs/docsify/blob/develop/docs/' +
                   vm.route.file;
               }
               var editHtml = '[:memo: Edit Document](' + url + ')\n';