Skip to content

Commit f11f212

Browse files
bors[bot]meili-botbrunoocasali
authored
Merge #664
664: Changes related to the next Meilisearch release (v0.26.0) r=brunoocasali a=meili-bot This PR gathers the changes related to the next Meilisearch release (v0.26.0) so that this package is ready when the official release is out. ⚠️ This PR should NOT be merged until: - the next release of Meilisearch (v0.26.0) is out. - the [`meilisearch-js`](https://github.com/meilisearch/meilisearch-js) dependency has been released to be compatible with Meilisearch v0.26.0. Once the release is out, the upgrade of the `meilisearch-js` dependency might be committed to this branch. _This PR is auto-generated for the [pre-release week](https://github.com/meilisearch/integration-guides/blob/master/guides/pre-release-week.md) purpose._ _Related to this issue: https://github.com/meilisearch/integration-guides/issues/181_ Co-authored-by: meili-bot <[email protected]> Co-authored-by: Bruno Casali <[email protected]>
2 parents 12cb544 + 977861b commit f11f212

File tree

7 files changed

+43
-23
lines changed

7 files changed

+43
-23
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
chmod +x meilisearch
3838
- name: Run Meilisearch
3939
run: |
40-
./meilisearch --master-key=masterKey --no-analytics true &
40+
./meilisearch --master-key=masterKey --no-analytics &
4141
- name: Setup Meilisearch Index
4242
run: yarn local:env:setup
4343
- name: Run local browser tests
@@ -75,7 +75,7 @@ jobs:
7575
- name: Get the latest Meilisearch RC
7676
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
7777
- name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
78-
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} ./meilisearch --master-key=masterKey --no-analytics=true
78+
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} ./meilisearch --master-key=masterKey --no-analytics
7979
- name: Install dependencies
8080
run: yarn install
8181
- name: Run tests

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
chmod +x meilisearch
3737
- name: Run Meilisearch
3838
run: |
39-
./meilisearch --master-key=masterKey --no-analytics true &
39+
./meilisearch --master-key=masterKey --no-analytics &
4040
- name: Install dependencies
4141
run: yarn --dev && yarn --cwd ./tests/env/react
4242
- name: Setup Meilisearch Index
@@ -76,7 +76,7 @@ jobs:
7676
./node_modules
7777
key: ${{ hashFiles('yarn.lock') }}
7878
- name: Docker setup
79-
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --no-analytics=true --master-key='masterKey'
79+
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --no-analytics --master-key='masterKey'
8080
- name: Install dependencies
8181
run: yarn install
8282
- name: Run tests

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Each PR should pass the tests and the linter to be accepted.
3939
```bash
4040
# Tests with Jest
4141
docker pull getmeili/meilisearch:latest # Fetch the latest version of Meilisearch image from Docker Hub
42-
docker run -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics=true
42+
docker run -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics
4343
# Integration tests
4444
yarn test
4545
# End-to-end tests

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ This package only guarantees the compatibility with the [version v4 of InstantSe
181181

182182
**Supported Meilisearch versions**:
183183

184-
This package only guarantees the compatibility with the [version v0.25.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.25.0).
184+
This package only guarantees the compatibility with the [version v0.26.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.26.0).
185185

186186
**Node / NPM versions**:
187187

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"url": "https://github.com/meilisearch/instant-meilisearch.git"
5757
},
5858
"dependencies": {
59-
"meilisearch": "0.24.0"
59+
"meilisearch": "0.25.0"
6060
},
6161
"devDependencies": {
6262
"@babel/cli": "^7.16.0",

tests/geosearch.tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ describe('Instant Meilisearch Browser test', () => {
3232
},
3333
])
3434
const hits = response.results[0].hits
35-
expect(hits.length).toEqual(13)
36-
expect(hits[0].city).toEqual('Ghent')
35+
expect(hits.length).toEqual(14)
36+
expect(hits[0].city).toEqual('Lille')
3737
})
3838

3939
test('Test aroundLatLng being overwritten by insideBoundingBox in geo search', async () => {

yarn.lock

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2580,12 +2580,12 @@ cosmiconfig@^5.0.0:
25802580
js-yaml "^3.13.1"
25812581
parse-json "^4.0.0"
25822582

2583-
cross-fetch@^3.1.4:
2584-
version "3.1.4"
2585-
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
2586-
integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
2583+
cross-fetch@^3.1.5:
2584+
version "3.1.5"
2585+
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
2586+
integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
25872587
dependencies:
2588-
node-fetch "2.6.1"
2588+
node-fetch "2.6.7"
25892589

25902590
cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
25912591
version "7.0.3"
@@ -5074,12 +5074,12 @@ [email protected]:
50745074
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
50755075
integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
50765076

5077-
meilisearch@0.24.0:
5078-
version "0.24.0"
5079-
resolved "https://registry.yarnpkg.com/meilisearch/-/meilisearch-0.24.0.tgz#a71454baac058f502b931af17069ab676fbaced6"
5080-
integrity sha512-qME1dsHZePBQi8qFdhbilcFzaL+oZJgUuls+FZ23hHpdhJI+iMFSmjjcfsxq5hdg2qczbCXv7yAo3Sh8xgfkgA==
5077+
meilisearch@0.25.0:
5078+
version "0.25.0"
5079+
resolved "https://registry.yarnpkg.com/meilisearch/-/meilisearch-0.25.0.tgz#8e980fbdd36b9fe6ed606205e262418f21e64d84"
5080+
integrity sha512-TSIJTh5lva7WHBaoG3arNYQXuIAQkcD3BY09h2nHhjHS/wzxWKJM45x5bEC67Grw8zXihVqqmWty4a4ps4S+tg==
50815081
dependencies:
5082-
cross-fetch "^3.1.4"
5082+
cross-fetch "^3.1.5"
50835083

50845084
merge-stream@^2.0.0:
50855085
version "2.0.0"
@@ -5168,10 +5168,12 @@ natural-compare@^1.4.0:
51685168
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
51695169
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
51705170

5171-
5172-
version "2.6.1"
5173-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
5174-
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
5171+
5172+
version "2.6.7"
5173+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
5174+
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
5175+
dependencies:
5176+
whatwg-url "^5.0.0"
51755177

51765178
node-int64@^0.4.0:
51775179
version "0.4.0"
@@ -6714,6 +6716,11 @@ tr46@^2.1.0:
67146716
dependencies:
67156717
punycode "^2.1.1"
67166718

6719+
tr46@~0.0.3:
6720+
version "0.0.3"
6721+
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
6722+
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
6723+
67176724
tree-kill@^1.2.2:
67186725
version "1.2.2"
67196726
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
@@ -6999,6 +7006,11 @@ walker@^1.0.7:
69997006
dependencies:
70007007
makeerror "1.0.x"
70017008

7009+
webidl-conversions@^3.0.0:
7010+
version "3.0.1"
7011+
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
7012+
integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
7013+
70027014
webidl-conversions@^5.0.0:
70037015
version "5.0.0"
70047016
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -7021,6 +7033,14 @@ whatwg-mimetype@^2.3.0:
70217033
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
70227034
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
70237035

7036+
whatwg-url@^5.0.0:
7037+
version "5.0.0"
7038+
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
7039+
integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
7040+
dependencies:
7041+
tr46 "~0.0.3"
7042+
webidl-conversions "^3.0.0"
7043+
70247044
whatwg-url@^8.0.0:
70257045
version "8.4.0"
70267046
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"

0 commit comments

Comments
 (0)