Merge branch 'master' into create-redirect

* master:
  [PageLayout] add data attribute to prevent Swiftype from indexing sidebar content (#146)
  0.16.2
  Prepare 0.16.2
  0.16.1
  Prepare 0.16.1
  0.16.0
  Prepare 0.16.0
  [search] update search-ui, add loader, increase debounce length (#145)
  0.15.2
  Prepare 0.15.2
  🐛do not package optionalDependencies and jest (#143)

CHANGELOG.md

@@ -1,3 +1,23 @@
+## Master
+
+* Add data attribute to prevent Swiftype from indexing sidebar content on `PageLayout`. [#146](https://github.com/mapbox/dr-ui/pull/146)
+
+## 0.16.2
+
+* Fix bug where `Search` filter was not displaying with the first query.
+
+## 0.16.1
+
+* Fix build that was improperly pushed to npm in 0.16.0.
+
+## 0.16.0
+
+* Update search-ui, add loader, increase debounce length, and reset search when modal is closed for `Search` component. [#145](https://github.com/mapbox/dr-ui/pull/145)
+
+## 0.15.2
+
+* Fix build to remove `optionalDependencies` and `jest` from package.json. [#143](https://github.com/mapbox/dr-ui/pull/143)
+
 ## 0.15.1
 
 * Fix toggle in `Search` to be a button and track toggle event.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/dr-ui",
-  "version": "0.15.1",
+  "version": "0.16.2",
   "description": "Mapbox frontend tools for documentation websites.",
   "main": "index.js",
   "scripts": {
@@ -65,9 +65,9 @@
     "unist-util-visit": "^1.4.0"
   },
   "dependencies": {
-    "@elastic/react-search-ui": "^0.8.0",
-    "@elastic/react-search-ui-views": "^0.8.0",
-    "@elastic/search-ui-site-search-connector": "^0.8.0",
+    "@elastic/react-search-ui": "^0.10.0",
+    "@elastic/react-search-ui-views": "^0.10.0",
+    "@elastic/search-ui-site-search-connector": "^0.10.0",
     "@mapbox/mr-ui": "^0.7.0",
     "classnames": "^2.2.6",
     "debounce": "^1.2.0",

scripts/build-package.js

@@ -57,7 +57,9 @@ function createPackageJson() {
   delete publishable.private;
   delete publishable.scripts;
   delete publishable.devDependencies;
+  delete publishable.optionalDependencies;
   delete publishable['lint-staged'];
+  delete publishable.jest;
   fs.writeFileSync(
     path.resolve(outputDir, 'package.json'),
     JSON.stringify(publishable, null, 2)

src/components/page-layout/__tests__/__snapshots__/page-layout.test.js.snap

@@ -6,6 +6,7 @@ exports[`page-layout Basic renders as expected 1`] = `
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -53,6 +54,7 @@ exports[`page-layout Code highlighting test renders as expected 1`] = `
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -121,6 +123,7 @@ exports[`page-layout Common use case renders as expected 1`] = `
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -325,6 +328,7 @@ exports[`page-layout Custom sidebar column size renders as expected 1`] = `
 >
   <div
     className="col col--4-mm col--3-ml col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -372,6 +376,7 @@ exports[`page-layout Custom sidebar column size, too large - default to original
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -419,6 +424,7 @@ exports[`page-layout Custom sidebar column size, too small - default to original
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"
@@ -466,6 +472,7 @@ exports[`page-layout Many first level items renders as expected 1`] = `
 >
   <div
     className="col col--4-mm  col--12 bg-gray-faint"
+    data-swiftype-index="false"
   >
     <div
       className="sticky-outer-wrapper"

src/components/page-layout/page-layout.js

@@ -95,6 +95,7 @@ class PageLayout extends React.Component {
           className={`col col--4-mm ${
             sideBarColSize ? `col--${sideBarColSize}-ml` : ''
           } col--12 ${props.sidebarTheme}`}
+          data-swiftype-index="false"
         >
           <Sticky
             enabled={state.stickyEnabled}

src/components/search/__tests__/__snapshots__/search.test.js.snap

@@ -262,6 +262,7 @@ exports[`search Search with \`narrow\` option set renders as expected 2`] = `
     >
       <div
         className="col col--4-mm  col--12 bg-gray-faint"
+        data-swiftype-index="false"
       >
         <div
           className="sticky-outer-wrapper"