Skip to content

Commit c52f078

Browse files
committed
Merge with main, and add vector store experimental feature
2 parents 9a95477 + 4f7c885 commit c52f078

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2440
-1489
lines changed

.code-samples.meilisearch.yaml

Lines changed: 55 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,35 +99,35 @@ multi_search_1: |-
9999
},
100100
]})
101101
get_all_tasks_1: |-
102-
client.getTasks()
102+
client.tasks.getTasks()
103103
get_task_1: |-
104-
client.getTask(1)
104+
client.tasks.getTask(1)
105105
async_guide_filter_by_date_1: |-
106-
client.getTasks({ afterEnqueuedAt: '2020-10-11T11:49:53.000Z' })
106+
client.tasks.getTasks({ afterEnqueuedAt: '2020-10-11T11:49:53.000Z' })
107107
async_guide_multiple_filters_1: |-
108-
client.getTasks({
108+
client.tasks.getTasks({
109109
indexUids: ['movies'],
110110
types: ['documentAdditionOrUpdate','documentDeletion'],
111111
statuses: ['processing']
112112
})
113113
async_guide_filter_by_ids_1: |-
114-
client.getTasks({ uids: [5, 10, 13] })
114+
client.tasks.getTasks({ uids: [5, 10, 13] })
115115
async_guide_filter_by_statuses_1: |-
116-
client.getTasks({ statuses: ['failed', 'canceled'] })
116+
client.tasks.getTasks({ statuses: ['failed', 'canceled'] })
117117
async_guide_filter_by_types_1: |-
118-
client.getTasks({ types: ['dumpCreation', 'indexSwap'] })
118+
client.tasks.getTasks({ types: ['dumpCreation', 'indexSwap'] })
119119
async_guide_filter_by_index_uids_1: |-
120-
client.getTasks({ indexUids: ['movies'] })
120+
client.tasks.getTasks({ indexUids: ['movies'] })
121121
get_all_tasks_paginating_1: |-
122-
client.getTasks({ limit: 2, from: 10 })
122+
client.tasks.getTasks({ limit: 2, from: 10 })
123123
get_all_tasks_paginating_2: |-
124-
client.getTasks({ limit: 2, from: 8 })
124+
client.tasks.getTasks({ limit: 2, from: 8 })
125125
async_guide_canceled_by_1: |-
126-
client.getTasks({ canceledBy: [9, 15] })
126+
client.tasks.getTasks({ canceledBy: [9, 15] })
127127
delete_tasks_1: |-
128-
client.deleteTasks({ uids: [1, 2] })
128+
client.tasks.deleteTasks({ uids: [1, 2] })
129129
cancel_tasks_1: |-
130-
client.cancelTasks({ uids: [1, 2] })
130+
client.tasks.cancelTasks({ uids: [1, 2] })
131131
get_one_key_1: |-
132132
client.getKey('6062abda-a5aa-4414-ac91-ecd7944c0f8d')
133133
get_all_keys_1: |-
@@ -398,6 +398,10 @@ typo_tolerance_guide_4: |-
398398
twoTypos: 10
399399
}
400400
})
401+
typo_tolerance_guide_5: |-
402+
client.index('movies').updateTypoTolerance({
403+
disableOnNumbers: true
404+
})
401405
add_movies_json_1: |-
402406
const movies = require('./movies.json')
403407
client.index('movies').addDocuments(movies).then((res) => console.log(res))
@@ -458,7 +462,7 @@ getting_started_update_searchable_attributes: |-
458462
getting_started_update_stop_words: |-
459463
client.index('movies').setting.updateStopWords(['the'])
460464
getting_started_check_task_status: |-
461-
client.getTask(0)
465+
client.tasks.getTask(0)
462466
getting_started_synonyms: |-
463467
client.index('movies').setting.updateSynonyms({
464468
winnie: ['piglet'],
@@ -806,9 +810,9 @@ update_prefix_search_settings_1: |-
806810
reset_prefix_search_settings_1: |-
807811
client.index('INDEX_NAME').setting.resetPrefixSearch();
808812
get_all_batches_1: |-
809-
client.getBatches();
813+
client.batches.getBatches();
810814
get_batch_1: |-
811-
client.getBatch(BATCH_UID);
815+
client.batches.getBatch(BATCH_UID);
812816
# Vector search
813817
update_embedders_1: |-
814818
client.index('INDEX_NAME').setting.updateEmbedders({
@@ -819,3 +823,38 @@ update_embedders_1: |-
819823
documentTemplate: 'A document titled '{{doc.title}}' whose description starts with {{doc.overview|truncatewords: 20}}'
820824
}
821825
});
826+
webhooks_get_1: |-
827+
client.getWebhooks()
828+
webhooks_get_single_1: |-
829+
client.getWebhook(WEBHOOK_UUID)
830+
webhooks_post_1: |-
831+
client.createWebhook({
832+
url: 'WEBHOOK_TARGET_URL',
833+
headers: {
834+
authorization: 'SECURITY_KEY',
835+
referer: 'https://example.com'
836+
}
837+
})
838+
webhooks_patch_1: |-
839+
client.updateWebhook(WEBHOOK_UUID, {
840+
headers: {
841+
referer: null
842+
}
843+
})
844+
webhooks_delete_1: |-
845+
client.deleteWebhook(WEBHOOK_UUID)
846+
search_parameter_reference_media_1: |-
847+
client.index('INDEX_NAME').search('a futuristic movie', {
848+
hybrid: {
849+
embedder: 'EMBEDDER_NAME'
850+
},
851+
media: {
852+
textAndPoster: {
853+
text: 'a futuristic movie',
854+
image: {
855+
mime: 'image/jpeg',
856+
data: 'base64EncodedImageData'
857+
}
858+
}
859+
}
860+
})

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ updates:
55
schedule:
66
interval: 'monthly'
77
labels:
8-
- 'skip-changelog'
98
- 'dependencies'
109
rebase-strategy: disabled
1110

@@ -17,7 +16,6 @@ updates:
1716
time: '04:00'
1817
open-pull-requests-limit: 10
1918
labels:
20-
- skip-changelog
2119
- dependencies
2220
versioning-strategy: increase
2321
rebase-strategy: disabled

.github/release-draft-template.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ categories:
1818
label: 'security'
1919
- title: '⚙️ Maintenance/misc'
2020
label:
21+
- 'dependencies'
2122
- 'maintenance'
2223
- 'documentation'
2324
template: |
@@ -27,9 +28,5 @@ template: |
2728
no-changes-template: 'Changes are coming soon 😎'
2829
sort-direction: 'ascending'
2930
replacers:
30-
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
31-
replace: ''
32-
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
33-
replace: ''
3431
- search: '/(?:and )?@meili-bot,?/g'
3532
replace: ''

.github/scripts/check-release.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,5 @@ if [ "$current_tag" != "$package_json_version" ]; then
1010
exit 1
1111
fi
1212

13-
package_version_ts=$(grep "PACKAGE_VERSION =" src/package-version.ts | cut -d "=" -f 2- | tr -d ';' | tr -d " " | tr -d '"')
14-
if [ "$current_tag" != "$package_version_ts" ]; then
15-
echo "Error: the current tag does not match the version in src/package-version.ts."
16-
echo "$current_tag vs $package_version_ts"
17-
exit 1
18-
fi
19-
2013
echo 'OK'
2114
exit 0

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Install dependencies
2020
run: yarn install

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
outputs:
2121
version: ${{ steps.grep-step.outputs.meilisearch_version }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Grep docker beta version of Meilisearch
2525
id: grep-step
2626
run: |
@@ -46,12 +46,12 @@ jobs:
4646
- '7700:7700'
4747
strategy:
4848
matrix:
49-
node: ['18', '20', '22']
49+
node: ['20', '22']
5050
name: integration-tests (Node.js ${{ matrix.node }})
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353
- name: Setup node
54-
uses: actions/setup-node@v4
54+
uses: actions/setup-node@v5
5555
with:
5656
node-version: ${{ matrix.node }}
5757
cache: yarn

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
outputs:
2424
version: ${{ steps.grep-step.outputs.meilisearch_version }}
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
- name: Grep docker beta version of Meilisearch
2828
id: grep-step
2929
run: |
@@ -43,12 +43,12 @@ jobs:
4343
- '7700:7700'
4444
strategy:
4545
matrix:
46-
node: ['18', '20', '22']
46+
node: ['20', '22']
4747
name: integration-tests (Node.js ${{ matrix.node }})
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- name: Setup node
51-
uses: actions/setup-node@v4
51+
uses: actions/setup-node@v5
5252
with:
5353
node-version: ${{ matrix.node }}
5454
cache: yarn

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
publish-npm:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-node@v4
13+
- uses: actions/checkout@v5
14+
- uses: actions/setup-node@v5
1515
with:
1616
node-version: 22
1717
registry-url: https://registry.npmjs.org/

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
node: ['18', '20', '22']
39+
node: ['20', '22']
4040
name: integration-tests (Node.js ${{ matrix.node }})
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
- name: Setup node
44-
uses: actions/setup-node@v4
44+
uses: actions/setup-node@v5
4545
with:
4646
node-version: ${{ matrix.node }}
4747
cache: 'yarn'
@@ -67,9 +67,9 @@ jobs:
6767
runs-on: ubuntu-latest
6868
name: style-check
6969
steps:
70-
- uses: actions/checkout@v4
70+
- uses: actions/checkout@v5
7171
- name: Setup node
72-
uses: actions/setup-node@v4
72+
uses: actions/setup-node@v5
7373
with:
7474
node-version: 22
7575
cache: 'yarn'
@@ -85,9 +85,9 @@ jobs:
8585
runs-on: ubuntu-latest
8686
name: types-check
8787
steps:
88-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
8989
- name: Setup node
90-
uses: actions/setup-node@v4
90+
uses: actions/setup-node@v5
9191
with:
9292
node-version: 22
9393
cache: 'yarn'

CONTRIBUTING.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ First of all, thank you for contributing to Meilisearch! The goal of this docume
3434

3535
To run this project, you will need:
3636

37-
- Node >= v18 and Node <= 22
37+
- Node >= v20 and Node <= 22
3838
- Yarn v1.x
3939

4040
### Setup
@@ -125,12 +125,6 @@ Make a PR modifying the following files with the right version:
125125
"version": "X.X.X",
126126
```
127127

128-
[`src/package-version`](/src/package-version.ts)
129-
130-
```javascript
131-
export const PACKAGE_VERSION = 'X.X.X'
132-
```
133-
134128
#### Github publish
135129

136130
Once the changes are merged on `main`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-js/releases): on this page, click on `Edit` (related to the draft release) > update the description (be sure you apply [these recommendations](https://github.com/meilisearch/integration-guides/blob/main/resources/integration-release.md#writting-the-release-description)) > when you are ready, click on `Publish release`.

0 commit comments

Comments
 (0)