Merge branch 'master' into feature/search-with-quotes

material/assets/manifest.json

@@ -1,10 +1,10 @@
 {
-  "assets/javascripts/bundle.js": "assets/javascripts/bundle.adcd0787.min.js",
+  "assets/javascripts/bundle.js": "assets/javascripts/bundle.fc9c3121.min.js",
-  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.adcd0787.min.js.map",
+  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.fc9c3121.min.js.map",
   "assets/javascripts/vendor.js": "assets/javascripts/vendor.de50e36d.min.js",
   "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.de50e36d.min.js.map",
-  "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.9b3611bd.min.js",
+  "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.a68abb33.min.js",
-  "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.9b3611bd.min.js.map",
+  "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.a68abb33.min.js.map",
   "assets/stylesheets/main.css": "assets/stylesheets/main.545621a7.min.css",
   "assets/stylesheets/main.css.map": "assets/stylesheets/main.545621a7.min.css.map",
   "assets/stylesheets/palette.css": "assets/stylesheets/palette.36d1b78f.min.css",

material/base.html

@@ -183,7 +183,7 @@
     </div>
     {% block scripts %}
       <script src="{{ 'assets/javascripts/vendor.de50e36d.min.js' | url }}"></script>
-      <script src="{{ 'assets/javascripts/bundle.adcd0787.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.fc9c3121.min.js' | url }}"></script>
       {%- set translations = {} -%}
       {%- for key in [
         "clipboard.copy",
@@ -207,7 +207,7 @@
           base: "{{ base_url }}",
           features: {{ config.theme.features | tojson }},
           search: Object.assign({
-            worker: "{{ 'assets/javascripts/worker/search.9b3611bd.min.js' | url }}"
+            worker: "{{ 'assets/javascripts/worker/search.a68abb33.min.js' | url }}"
           }, typeof search !== "undefined" && search)
         })
       </script>

package-lock.json

@@ -505,9 +505,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.0.13",
+      "version": "14.0.14",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz",
-      "integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA==",
+      "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -603,9 +603,9 @@
       }
     },
     "@types/webpack": {
-      "version": "4.41.17",
+      "version": "4.41.18",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.18.tgz",
-      "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==",
+      "integrity": "sha512-mQm2R8vV2BZE/qIDVYqmBVLfX73a8muwjs74SpjEyJWJxeXBbsI9L65Pcia9XfYLYWzD1c1V8m+L0p30y2N7MA==",
       "dev": true,
       "requires": {
         "@types/anymatch": "*",
@@ -1076,17 +1076,17 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.8.0",
+      "version": "9.8.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.4.tgz",
-      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+      "integrity": "sha512-84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A==",
       "dev": true,
       "requires": {
         "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001061",
+        "caniuse-lite": "^1.0.30001087",
-        "chalk": "^2.4.2",
+        "colorette": "^1.2.0",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.30",
+        "postcss": "^7.0.32",
         "postcss-value-parser": "^4.1.0"
       },
       "dependencies": {
@@ -1511,9 +1511,9 @@
       }
     },
     "binary-extensions": {
-      "version": "2.0.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
     "bindings": {
@@ -1651,15 +1651,15 @@
       }
     },
     "browserslist": {
-      "version": "4.12.0",
+      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.2.tgz",
-      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+      "integrity": "sha512-MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001043",
+        "caniuse-lite": "^1.0.30001088",
-        "electron-to-chromium": "^1.3.413",
+        "electron-to-chromium": "^1.3.483",
-        "node-releases": "^1.1.53",
+        "escalade": "^3.0.1",
-        "pkg-up": "^2.0.0"
+        "node-releases": "^1.1.58"
       }
     },
     "buffer": {
@@ -1906,9 +1906,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001088",
+      "version": "1.0.30001090",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001088.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001090.tgz",
-      "integrity": "sha512-6eYUrlShRYveyqKG58HcyOfPgh3zb2xqs7NvT2VVtP3hEUeeWvc3lqhpeMTxYWBBeeaT9A4bKsrtjATm66BTHg==",
+      "integrity": "sha512-QzPRKDCyp7RhjczTPZaqK3CjPA5Ht2UnXhZhCI4f7QiB5JK6KEuZBxIzyWnB3wO4hgAj4GMRxAhuiacfw0Psjg==",
       "dev": true
     },
     "caw": {
@@ -2215,6 +2215,12 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "colorette": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.0.tgz",
+      "integrity": "sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3229,9 +3235,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.481",
+      "version": "1.3.483",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz",
-      "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==",
+      "integrity": "sha512-+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg==",
       "dev": true
     },
     "elliptic": {
@@ -3335,6 +3341,12 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "escalade": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz",
+      "integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -7049,15 +7061,6 @@
         }
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      }
-    },
     "pngquant-bin": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-5.0.2.tgz",
@@ -8132,9 +8135,9 @@
       }
     },
     "sass": {
-      "version": "1.26.8",
+      "version": "1.26.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.8.tgz",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.9.tgz",
-      "integrity": "sha512-yvtzyrKLGiXQu7H12ekXqsfoGT/aTKeMDyVzCB675k1HYuaj0py63i8Uf4SI9CHXj6apDhpfwbUr3gGOjdpu2Q==",
+      "integrity": "sha512-t8AkRVi+xvba4yZiLWkJdgJHBFCB3Dh4johniQkPy9ywkgFHNasXFEFP+RG/F6LhQ+aoE4aX+IorIWQjS0esVw==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"

package.json

@@ -50,12 +50,12 @@
     "@types/html-minifier": "^4.0.0",
     "@types/lunr": "^2.3.3",
     "@types/mini-css-extract-plugin": "^0.9.1",
-    "@types/node": "^14.0.13",
+    "@types/node": "^14.0.14",
     "@types/ramda": "^0.27.6",
     "@types/resize-observer-browser": "^0.1.3",
-    "@types/webpack": "^4.41.17",
+    "@types/webpack": "^4.41.18",
     "@types/webpack-assets-manifest": "^3.0.1",
-    "autoprefixer": "9.8.0",
+    "autoprefixer": "9.8.4",
     "copy-webpack-plugin": "^6.0.2",
     "css-loader": "^3.6.0",
     "event-hooks-webpack-plugin": "^2.1.6",
@@ -75,7 +75,7 @@
     "preact": "^10.4.4",
     "resize-observer-polyfill": "^1.5.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.26.8",
+    "sass": "^1.26.9",
     "sass-loader": "^8.0.2",
     "stylelint": "^13.6.1",
     "stylelint-config-rational-order": "^0.1.2",

src/assets/javascripts/integrations/search/highlighter/index.ts

@@ -71,7 +71,7 @@ export function setupSearchHighlighter(
   /* Return factory function */
   return (value: string) => {
     value = value
-      .replace(/[\s*+-:~^]+/g, " ")
+      .replace(/[\s*+\-:~^]+/g, " ")
       .trim()
 
     /* Create search term match expression */