Merge branch 'develop' into patch-1

Koooooo-7 · web-flow · commit aceab025db8f · 2021-04-11T20:33:26.000+08:00
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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.
diff --git a/.github/workflows/test.yml b/.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)
diff --git a/docs/deploy.md b/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
 
diff --git a/docs/index.html b/docs/index.html
@@ -111,6 +111,7 @@
             '/zh-cn/': '搜索',
             '/': 'Search',
           },
+          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
         },
         vueComponents: {
           'button-counter': {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "*.js": "eslint --fix"
   },
   "dependencies": {
-    "dompurify": "^2.2.6",
+    "dompurify": "^2.2.7",
     "marked": "^1.2.9",
     "medium-zoom": "^1.0.6",
     "opencollective-postinstall": "^2.0.2",
diff --git a/packages/docsify-server-renderer/package-lock.json b/packages/docsify-server-renderer/package-lock.json
diff --git a/packages/docsify-server-renderer/package.json b/packages/docsify-server-renderer/package.json
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "debug": "^4.3.2",
-    "docsify": "^4.12.0",
-    "dompurify": "^2.2.6",
+    "docsify": "^4.12.1",
+    "dompurify": "^2.2.7",
     "node-fetch": "^2.6.0",
     "resolve-pathname": "^3.0.0"
   }
diff --git a/src/plugins/search/component.js b/src/plugins/search/component.js
@@ -137,8 +137,8 @@ function doSearch(value) {
     $panel.innerHTML = '';
 
     if (options.hideOtherSidebarContent) {
-      $sidebarNav.classList.remove('hide');
-      $appName.classList.remove('hide');
+      $sidebarNav && $sidebarNav.classList.remove('hide');
+      $appName && $appName.classList.remove('hide');
     }
 
     return;
@@ -160,8 +160,8 @@ function doSearch(value) {
   $clearBtn.classList.add('show');
   $panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`;
   if (options.hideOtherSidebarContent) {
-    $sidebarNav.classList.add('hide');
-    $appName.classList.add('hide');
+    $sidebarNav && $sidebarNav.classList.add('hide');
+    $appName && $appName.classList.add('hide');
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ function doSearch(value) {`
`137`	`137`	`$panel.innerHTML = '';`
`138`	`138`
`139`	`139`	`if (options.hideOtherSidebarContent) {`
`140`		`- $sidebarNav.classList.remove('hide');`
`141`		`- $appName.classList.remove('hide');`
	`140`	`+ $sidebarNav && $sidebarNav.classList.remove('hide');`
	`141`	`+ $appName && $appName.classList.remove('hide');`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`return;`
`@@ -160,8 +160,8 @@ function doSearch(value) {`
`160`	`160`	`$clearBtn.classList.add('show');`
`161`	`161`	$panel.innerHTML = html \|\| `<p class="empty">${NO_DATA_TEXT}</p>`;
`162`	`162`	`if (options.hideOtherSidebarContent) {`
`163`		`- $sidebarNav.classList.add('hide');`
`164`		`- $appName.classList.add('hide');`
	`163`	`+ $sidebarNav && $sidebarNav.classList.add('hide');`
	`164`	`+ $appName && $appName.classList.add('hide');`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`