fix merge conflict

.github/workflows/coverage.yml

@@ -1,5 +1,5 @@
 # This workflow will run our tests, generate an lcov code coverage file,
-# and send that coverage to Coveralls 
+# and send that coverage to Coveralls
 
 name: Code Coverage
 

.github/workflows/sync-sites-branch.yml

@@ -6,21 +6,12 @@ on:
       - main
 
 jobs:
-  sync-branches:
-    runs-on: ubuntu-latest
-    name: Syncing branches
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: devmasx/merge-branch@v1.4.0
-        with:
-          type: now
-          from_branch: ${{ github.event.repository.default_branch }}
-          target_branch: storybook-site
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: devmasx/merge-branch@v1.4.0
-        with:
-          type: now
-          from_branch: ${{ github.event.repository.default_branch }}
-          target_branch: test-site
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+  call_sync_branches:
+    strategy:
+      matrix:
+        target_branch: ["storybook-site", "test-site"]
+    uses: yext/slapshot-reusable-workflows/.github/workflows/sync_default_branch.yml@v1
+    with:
+      target_branch: ${{ matrix.target_branch }}
+    secrets:
+      caller_github_token: ${{ secrets.GITHUB_TOKEN }}

.storybook/main.js

@@ -3,6 +3,7 @@ module.exports = {
     '../tests/**/*.stories.tsx'
   ],
   addons: [
+    '@etchteam/storybook-addon-status',
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',

.storybook/preview.js

@@ -27,6 +27,10 @@ export const parameters = {
         'DirectAnswer',
         'FilterSearch',
         'StaticFilters',
+        'Facets',
+        'StandardFacet',
+        'NumericalFacet',
+        'HierarchicalFacet',
         'StandardFacets',
         'NumericalFacets',
         'HierarchicalFacets',
@@ -36,6 +40,7 @@ export const parameters = {
         'AlternativeVerticals',
         'SpellCheck',
         'ResultsCount',
+        'Geolocation',
         'LocationBias',
         'Dropdown'
       ]

README.md

@@ -78,4 +78,8 @@ To use the Component Library's Styling without adding Tailwind to your project,
 
 ```tsx
 import '@yext/search-ui-react/bundle.css'
-```
+```
+
+## Compatibility Notes
+
+This library and its dependencies use optional chaining and other modern TS syntax that is not inherently supported by Webpack <5 (e.g. via `create-react-app@4`). Additional Babel plugins are needed for transpiling if using legacy versions.