Skip to content

Commit 183e8cc

Browse files
authored
Merge branch 'main' into fix_prototype_section_contributing
2 parents 8f0b9c2 + 684256b commit 183e8cc

File tree

21 files changed

+143
-174
lines changed

21 files changed

+143
-174
lines changed

.github/workflows/meilisearch-prototype-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Setup node
4848
uses: actions/setup-node@v3
4949
with:
50-
node-version: 16
50+
node-version: 18
5151
cache: yarn
5252
- name: Install dependencies
5353
run: yarn

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Setup node
4646
uses: actions/setup-node@v3
4747
with:
48-
node-version: 16
48+
node-version: 18
4949
cache: yarn
5050
- name: Install dependencies
5151
run: yarn

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v3
1919
- uses: actions/setup-node@v3
2020
with:
21-
node-version: '16.x'
21+
node-version: '18.x'
2222
registry-url: https://registry.npmjs.org/
2323
- name: Install dependencies
2424
run: yarn

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup node
3939
uses: actions/setup-node@v3
4040
with:
41-
node-version: 16
41+
node-version: 18
4242
cache: yarn
4343
- name: Install dependencies
4444
run: yarn
@@ -109,7 +109,7 @@ jobs:
109109
- name: Setup node
110110
uses: actions/setup-node@v3
111111
with:
112-
node-version: 16
112+
node-version: 18
113113
cache: yarn
114114
- name: Install dependencies
115115
run: yarn install
@@ -127,7 +127,7 @@ jobs:
127127
- name: Setup node
128128
uses: actions/setup-node@v3
129129
with:
130-
node-version: 16
130+
node-version: 18
131131
cache: yarn
132132
- name: Install dependencies
133133
run: yarn

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ First of all, thank you for contributing to Meilisearch! The goal of this docume
1111
## Assumptions
1212

1313
1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) (PR) workflow.**
14-
2. **You've read the Meilisearch [documentation](https://docs.meilisearch.com) and the [README](/README.md).**
15-
3. **You know about the [Meilisearch community](https://docs.meilisearch.com/learn/what_is_meilisearch/contact.html). Please use this for help.**
14+
2. **You've read the Meilisearch [documentation](https://www.meilisearch.com/docs) and the [README](/README.md).**
15+
3. **You know about the [Meilisearch community](https://discord.com/invite/meilisearch). Please use this for help.**
1616

1717
## How to Contribute
1818

README.md

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<h4 align="center">
88
<a href="https://github.com/meilisearch/meilisearch">Meilisearch</a> |
9-
<a href="https://docs.meilisearch.com">Documentation</a> |
9+
<a href="https://www.meilisearch.com/docs">Documentation</a> |
1010
<a href="https://discord.meilisearch.com">Discord</a> |
1111
<a href="https://roadmap.meilisearch.com/tabs/1-under-consideration">Roadmap</a> |
1212
<a href="https://www.meilisearch.com">Website</a> |
13-
<a href="https://docs.meilisearch.com/faq">FAQ</a>
13+
<a href="https://www.meilisearch.com/docs/faq">FAQ</a>
1414
</h4>
1515

1616
<p align="center">
@@ -35,7 +35,7 @@ If you use Angular, React, or Vue, you might want to check out these repositorie
3535
- [meilisearch-react](https://github.com/meilisearch/meilisearch-react/)
3636
- [meilisearch-vue](https://github.com/meilisearch/meilisearch-vue/)
3737

38-
NB: If you don't have any Meilisearch instance running and containing your data, you should take a look at this [getting started page](https://docs.meilisearch.com/learn/tutorials/getting_started.html).
38+
NB: If you don't have any Meilisearch instance running and containing your data, you should take a look at this [getting started page](https://www.meilisearch.com/docs/learn/getting_started/installation).
3939

4040
## Table of Contents <!-- omit in toc -->
4141

@@ -50,7 +50,7 @@ NB: If you don't have any Meilisearch instance running and containing your data,
5050

5151
## 📖 Documentation
5252

53-
For general information on how to use Meilisearch—such as our API reference, tutorials, guides, and in-depth articles—refer to our [main documentation website](https://docs.meilisearch.com/).
53+
For general information on how to use Meilisearch—such as our API reference, tutorials, guides, and in-depth articles—refer to our [main documentation website](https://www.meilisearch.com/docs/).
5454

5555
## 🔧 Installation
5656

@@ -83,7 +83,7 @@ const searchClient = instantMeiliSearch(
8383
### Parameters
8484

8585
- `Host` - URL of Meilisearch instance
86-
- `API Key` - Meilisearch access API Key. This can either be a string or a synchronous function that returns a string. ⚠️ Prefer using a key with only [search permissions](https://docs.meilisearch.com/learn/security/master_api_keys.html#master-key-and-api-keys) as it is used on your front-end.
86+
- `API Key` - Meilisearch access API Key. This can either be a string or a synchronous function that returns a string. ⚠️ Prefer using a key with only [search permissions](https://www.meilisearch.com/docs/learn/security/master_api_keys#master-key-and-api-keys) as it is used on your front-end.
8787

8888
## 💅 Customization
8989

@@ -137,7 +137,7 @@ Example:
137137

138138
### Primary key
139139

140-
Specify the field in your documents containing the [unique identifier](https://docs.meilisearch.com/learn/core_concepts/documents.html#primary-field) (`undefined` by default). By adding this option, we avoid instantSearch errors that are thrown in the browser console. In `React` particularly, this option removes the `Each child in a list should have a unique "key" prop` error.
140+
Specify the field in your documents containing the [unique identifier](https://www.meilisearch.com/docs/learn/core_concepts/documents#primary-field) (`undefined` by default). By adding this option, we avoid instantSearch errors that are thrown in the browser console. In `React` particularly, this option removes the `Each child in a list should have a unique "key" prop` error.
141141

142142
```js
143143
{ primaryKey : 'id' } // default: undefined
@@ -168,7 +168,7 @@ genres:
168168

169169
### Matching strategy
170170

171-
`matchingStrategy` gives you the possibility to choose how Meilisearch should handle the presence of multiple query words, see [documentation](https://docs.meilisearch.com/reference/api/search.html#matching-strategy).
171+
`matchingStrategy` gives you the possibility to choose how Meilisearch should handle the presence of multiple query words, see [documentation](https://www.meilisearch.com/docs/reference/api/search#matching-strategy).
172172

173173
For example, if your query is `hello world` by default Meilisearch returns documents containing either both `hello` and `world` or documents that only contain `hello`. This is the `last` strategy, where words are stripped from the right.
174174
The other strategy is `all`, where both `hello` and `world` **must** be present in a document for it to be returned.
@@ -219,7 +219,7 @@ You can use your own HTTP client, for example, with [`axios`](https://github.com
219219

220220
The open-source [InstantSearch](https://www.algolia.com/doc/api-reference/widgets/js/) library powered by Algolia provides all the front-end tools you need to highly customize your search bar environment.
221221

222-
InstantSearch requires that you provide an indexName. The indexName corresponds to the [index `uid`](https://docs.meilisearch.com/learn/core_concepts/indexes.html#indexes) in which your document are stored in Meilisearch.
222+
InstantSearch requires that you provide an indexName. The indexName corresponds to the [index `uid`](https://www.meilisearch.com/docs/learn/core_concepts/indexes#indexes) in which your document are stored in Meilisearch.
223223

224224
In `index.html`:
225225

@@ -284,7 +284,7 @@ search.start()
284284
## More Documentation
285285

286286
- The open-source InstantSearch library is widely used and well documented in the [Algolia documentation](https://www.algolia.com/doc/api-reference/widgets/js/). It provides all the widgets to customize and improve your search bar environment in your website.
287-
- The [Meilisearch documentation](https://docs.meilisearch.com/).
287+
- The [Meilisearch documentation](https://www.meilisearch.com/docs/).
288288
- If you use React, check out [meilisearch-react](https://github.com/meilisearch/meilisearch-react/)
289289
- If you use Vue, check out [meilisearch-vue](https://github.com/meilisearch/meilisearch-vue/)
290290
- If you use Angular, check out [meilisearch-angular](https://github.com/meilisearch/meilisearch-angular/)
@@ -356,7 +356,7 @@ List of all the components that are available in [instantSearch](https://github.
356356

357357
`instantSearch` is the main component. It manages the widget and lets you add new ones.
358358

359-
- ✅ IndexName: [`uid` of your index](https://docs.meilisearch.com/learn/core_concepts/indexes.html#indexes). _required_
359+
- ✅ IndexName: [`uid` of your index](https://www.meilisearch.com/docs/learn/core_concepts/indexes#indexes). _required_
360360
- ✅ SearchClient: Search client, in our case instant-meilisearch. See [customization](#-customization) for details on options. _required_
361361
- ❌ numberLocale: Does not work with both Algoliasearch and instant-meilisearch.
362362
- ✅ searchFunction: Surcharge the search function provided by the search client.
@@ -422,7 +422,7 @@ Because these are the search parameters of AlgoliaSearch and not the InstantSear
422422
Since we do not act as AlgoliaSearch on search parameters, detailed compatibility can be found in [this issue](https://github.com/meilisearch/instant-meilisearch/issues/389).<br>
423423
This component should only be used if no other component provides the same configuration.
424424

425-
We also suggest looking at [Meilisearch's search parameters](https://docs.meilisearch.com/reference/features/search_parameters.html) to determine how they act.
425+
We also suggest looking at [Meilisearch's search parameters](https://www.meilisearch.com/docs/reference/api/search#search-parameters) to determine how they act.
426426

427427
```js
428428
instantsearch.widgets.configure({
@@ -568,7 +568,7 @@ The `snippet` function returns an attribute from a hit into its snippet form, wh
568568

569569
Note that the attribute has to be added to `attributesToSnippet` in [configuration](#-configure). Highlight is applied on snippeted fields.
570570

571-
Snippeting is called `cropping` in Meilisearch, [more about it here](https://docs.meilisearch.com/reference/features/search_parameters.html#attributes-to-retrieve). It is possible to change the size of the snippeting by adding its character size in the attributesToSnippet parameter. <br>
571+
Snippeting is called `cropping` in Meilisearch, [more about it here](https://www.meilisearch.com/docs/reference/api/search#attributes-to-retrieve). It is possible to change the size of the snippeting by adding its character size in the attributesToSnippet parameter. <br>
572572
For example: `"description:40"`.
573573

574574
The `40` value represents the number of characters (rounded down to always have full words) and not the number of words. Thus, the snippet string size is always equal to or lower than `40` characters.
@@ -681,7 +681,7 @@ Alternatively, the parameters can be passed through the [`searchFunction`](https
681681
},
682682
```
683683

684-
[Read the guide on how GeoSearch works in Meilisearch](https://docs.meilisearch.com/reference/features/geosearch.html#geosearch).
684+
[Read the guide on how GeoSearch works in Meilisearch](https://www.meilisearch.com/docs/learn/getting_started/filtering_and_sorting#geosearch).
685685

686686
### ❌ Answers
687687

@@ -742,7 +742,7 @@ The `hierarchicalMenu` widget is used to create navigation based on a hierarchy
742742
#### Hierarchical Menu Usage
743743
To make it work with Meilisearch your documents must have a specific structure, an explanation of the structure can [be found here](https://www.algolia.com/doc/api-reference/widgets/hierarchical-menu/js/#requirements).
744744

745-
Contrary to `instantsearch.js`, the hierarchical fields are added in [`filterableAttributes`](https://docs.meilisearch.com/reference/api/filterable_attributes.html#update-filterable-attributes).
745+
Contrary to `instantsearch.js`, the hierarchical fields are added in [`filterableAttributes`](https://www.meilisearch.com/docs/reference/api/settings#filterable-attributes).
746746

747747
Example:
748748
Give the following document structure:
@@ -778,14 +778,13 @@ The `rangeSlider` widget provides a user-friendly way to filter the results, bas
778778
- ✅ attribute: The name of the attribute in the document. _required_.
779779
- ✅ min: The minimum value for the input. _required_
780780
- ✅ max: The maximum value for the input. _required_
781-
- precision: The number of digits after the decimal point to use. Not compatible as only integers work with `rangeSlider`.
781+
- precision: The number of digits after the decimal point to use. Not compatible as only integers work with `rangeSlider`.
782782
- ✅ step: The number of steps between each handle move.
783783
- ✅ pips: Whether to show slider pips (ruler marks).
784784
- ✅ tooltips: Whether to show tooltips. The default tooltips show the raw value.
785785
- ✅ cssClasses: The CSS classes to override.
786786

787-
To be able to use the `rangeSlider` on an attribute, the attribute must be in the[`filterableAttributes`](https://docs.meilisearch.com/reference/features/filtering_and_faceted_search.html#configuring-filters) and must contain numeric values.
788-
787+
To be able to use the `rangeSlider` on an attribute, the attribute must be in the[`filterableAttributes`](https://www.meilisearch.com/docs/reference/api/settings#filterable-attributes) and must contain numeric values.
789788

790789
### ✅ Menu
791790

@@ -829,7 +828,7 @@ The `rangeInput` widget allows a user to select a numeric range using a minimum
829828
- ✅ templates: The templates to use for the widget.
830829
- ✅ cssClasses: The CSS classes to override.
831830

832-
To be able to use the `RangeInput` on an attribute, the attribute must be in the[`filterableAttributes`](https://docs.meilisearch.com/reference/features/filtering_and_faceted_search.html#configuring-filters) and must contain numeric values.
831+
To be able to use the `RangeInput` on an attribute, the attribute must be in the[`filterableAttributes`](https://www.meilisearch.com/docs/reference/api/settings#filterable-attributes) and must contain numeric values.
833832

834833
### ✅ MenuSelect
835834

@@ -885,7 +884,7 @@ The `RatingMenu` widget lets the user refine search results by clicking on stars
885884
- ✅ templates: The templates to use for the widget.
886885
- ✅ cssClasses: The CSS classes to override.
887886

888-
Contrary to `instantsearch.js`, To be able to use `RatingMenu` the field containing the rating has to be added in the [`filterableAttributes`](https://docs.meilisearch.com/reference/api/filterable_attributes.html#update-filterable-attributes) setting in your index settings.
887+
Contrary to `instantsearch.js`, To be able to use `RatingMenu` the field containing the rating has to be added in the [`filterableAttributes`](https://www.meilisearch.com/docs/reference/api/settings#filterable-attributes) setting in your index settings.
889888

890889
### ✅ ClearRefinements
891890

@@ -1013,7 +1012,7 @@ A sort formula is expressed like this: `index:attribute:order`.
10131012

10141013
`index` is mandatory, and when adding `attribute:order`, they must always be added together.
10151014

1016-
When sorting on an attribute, the attribute has to be added to the [`sortableAttributes`](https://docs.meilisearch.com/reference/api/sortable_attributes.html) setting on your index.
1015+
When sorting on an attribute, the attribute has to be added to the [`sortableAttributes`](https://www.meilisearch.com/docs/reference/api/settings#sortable-attributes) setting on your index.
10171016

10181017
Example:
10191018
```js
@@ -1024,24 +1023,11 @@ Example:
10241023

10251024
In this scenario, in the `clothes` index, we want the price to be sorted in an ascending way. For this formula to be valid, `price` must be added to the `sortableAttributes` settings of the `clothes` index.
10261025

1027-
#### Sort by multiple attributes
1028-
When sorting by mutiple fields sort formula is expressed like this: `index:attribute:order,attribute2:order`.
1029-
1030-
Example:
1031-
```js
1032-
[
1033-
{ label: 'Sort By Price And Title', value: 'clothes:price:asc,title:asc' }
1034-
]
1035-
```
1036-
1037-
⚠️ Attributes with comma in their name are not allowed.
1038-
1039-
10401026
#### Relevancy
10411027

1042-
The impact sorting has on the returned hits is determined by the [`ranking-rules`](https://docs.meilisearch.com/learn/core_concepts/relevancy.html#ranking-rules) ordered list of each index. The `sort` ranking-rule position in the list makes sorting documents more or less important than other rules. If you want to change the sort impact on the relevancy, it is possible to change it in the [ranking-rule setting](https://docs.meilisearch.com/learn/core_concepts/relevancy.html#relevancy). For example, to favor exhaustivity over relevancy.
1028+
The impact sorting has on the returned hits is determined by the [`ranking-rules`](https://www.meilisearch.com/docs/learn/core_concepts/relevancy#ranking-rules) ordered list of each index. The `sort` ranking-rule position in the list makes sorting documents more or less important than other rules. If you want to change the sort impact on the relevancy, it is possible to change it in the [ranking-rule setting](https://www.meilisearch.com/docs/learn/core_concepts/relevancy#relevancy). For example, to favor exhaustivity over relevancy.
10431029

1044-
See [relevancy guide](https://docs.meilisearch.com/learn/core_concepts/relevancy.html#relevancy).
1030+
See [relevancy guide](https://www.meilisearch.com/docs/learn/core_concepts/relevancy#relevancy).
10451031

10461032
#### Example
10471033

packages/instant-meilisearch/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @meilisearch/instant-meilisearch
22

3+
## 0.13.1
4+
5+
### Patch Changes
6+
7+
- bcf09c9: Fixes a bug where if a facet contained multiple words it failed
8+
39
## 0.13.0
410

511
### Minor Changes

0 commit comments

Comments
 (0)