Skip to content

Commit ef3576f

Browse files
committed
Merge branch 'main' of https://github.com/meilisearch/instant-meilisearch into add/support-for-multiple-sort-attributes
2 parents 3098d6c + 87e7c42 commit ef3576f

File tree

4 files changed

+53
-68
lines changed

4 files changed

+53
-68
lines changed

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
auto-merge:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: ahmadnassri/action-dependabot-auto-merge@v2
1414
with:
1515
target: patch

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"devDependencies": {
3333
"parcel-bundler": "^1.12.5",
34-
"turbo": "^1.7.0"
34+
"turbo": "^1.8.5"
3535
},
3636
"dependencies": {
3737
"@changesets/cli": "^2.26.0",

packages/instant-meilisearch/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"meilisearch": "^0.31.1"
5151
},
5252
"devDependencies": {
53-
"@babel/cli": "^7.20.7",
53+
"@babel/cli": "^7.21.0",
5454
"@babel/core": "^7.20.12",
5555
"@babel/preset-env": "^7.20.2",
5656
"@rollup/plugin-commonjs": "^17.1.0",

yarn.lock

Lines changed: 50 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,12 @@
345345
resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
346346
integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
347347

348-
"@babel/cli@^7.20.7":
349-
version "7.20.7"
350-
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c"
351-
integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ==
348+
"@babel/cli@^7.21.0":
349+
version "7.21.0"
350+
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.21.0.tgz#1868eb70e9824b427fc607610cce8e9e7889e7e1"
351+
integrity sha512-xi7CxyS8XjSyiwUGCfwf+brtJxjW1/ZTcBUkP10xawIEXLX5HzLn+3aXkgxozcP2UhRhtKTmQurw9Uaes7jZrA==
352352
dependencies:
353-
"@jridgewell/trace-mapping" "^0.3.8"
353+
"@jridgewell/trace-mapping" "^0.3.17"
354354
commander "^4.0.1"
355355
convert-source-map "^1.1.0"
356356
fs-readdir-recursive "^1.1.0"
@@ -2333,15 +2333,7 @@
23332333
"@jridgewell/resolve-uri" "^3.0.3"
23342334
"@jridgewell/sourcemap-codec" "^1.4.10"
23352335

2336-
"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
2337-
version "0.3.14"
2338-
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
2339-
integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
2340-
dependencies:
2341-
"@jridgewell/resolve-uri" "^3.0.3"
2342-
"@jridgewell/sourcemap-codec" "^1.4.10"
2343-
2344-
"@jridgewell/trace-mapping@^0.3.14":
2336+
"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
23452337
version "0.3.17"
23462338
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
23472339
integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -5051,14 +5043,7 @@ content-type@~1.0.4:
50515043
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
50525044
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
50535045

5054-
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
5055-
version "1.7.0"
5056-
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
5057-
integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
5058-
dependencies:
5059-
safe-buffer "~5.1.1"
5060-
5061-
convert-source-map@^1.5.1:
5046+
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
50625047
version "1.9.0"
50635048
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
50645049
integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -7706,9 +7691,9 @@ htmlparser2@^6.0.0:
77067691
entities "^2.0.0"
77077692

77087693
http-cache-semantics@^4.1.0:
7709-
version "4.1.0"
7710-
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
7711-
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
7694+
version "4.1.1"
7695+
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
7696+
integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
77127697

77137698
http-deceiver@^1.2.7:
77147699
version "1.2.7"
@@ -13701,47 +13686,47 @@ tunnel-agent@^0.6.0:
1370113686
dependencies:
1370213687
safe-buffer "^5.0.1"
1370313688

13704-
turbo-darwin-64@1.7.0:
13705-
version "1.7.0"
13706-
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.7.0.tgz#e53ed2e791ce4d146a76aa7c276c84d590134550"
13707-
integrity sha512-hSGAueSf5Ko8J67mpqjpt9FsP6ePn1nMcl7IVPoJq5dHsgX3anCP/BPlexJ502bNK+87DDyhQhJ/LPSJXKrSYQ==
13708-
13709-
turbo-darwin-arm64@1.7.0:
13710-
version "1.7.0"
13711-
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.7.0.tgz#d5fdeccb38f1092b5c888f83a2dcd9ae97068dad"
13712-
integrity sha512-BLLOW5W6VZxk5+0ZOj5AO1qjM0P5isIgjbEuyAl8lHZ4s9antUbY4CtFrspT32XxPTYoDl4UjviPMcSsbcl3WQ==
13713-
13714-
turbo-linux-64@1.7.0:
13715-
version "1.7.0"
13716-
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.7.0.tgz#48cf63aa51cde67d5a56eb70df6d7a93548376fa"
13717-
integrity sha512-aw2qxmfZa+kT87SB3GNUoFimqEPzTlzlRqhPgHuAAT6Uf0JHnmebPt4K+ZPtDNl5yfVmtB05bhHPqw+5QV97Yg==
13718-
13719-
turbo-linux-arm64@1.7.0:
13720-
version "1.7.0"
13721-
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.7.0.tgz#1b9b047d72071f9b8090057ede40ca54db945ae7"
13722-
integrity sha512-AJEx2jX+zO5fQtJpO3r6uhTabj4oSA5ZhB7zTs/rwu/XqoydsvStA4X8NDW4poTbOjF7DcSHizqwi04tSMzpJw==
13723-
13724-
turbo-windows-64@1.7.0:
13725-
version "1.7.0"
13726-
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.7.0.tgz#4683b84c5ba806cba8ab3ec28e4a62f46bdc9901"
13727-
integrity sha512-ewj7PPv2uxqv0r31hgnBa3E5qwUu7eyVRP5M1gB/TJXfSHduU79gbxpKCyxIZv2fL/N2/3U7EPOQPSZxBAoljA==
13728-
13729-
turbo-windows-arm64@1.7.0:
13730-
version "1.7.0"
13731-
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.7.0.tgz#4cdcae60868df73e2af06dcaf39e1c725176cf7f"
13732-
integrity sha512-LzjOUzveWkvTD0jP8DBMYiAnYemmydsvqxdSmsUapHHJkl6wKZIOQNSO7pxsy+9XM/1/+0f9Y9F9ZNl5lePTEA==
13733-
13734-
turbo@^1.7.0:
13735-
version "1.7.0"
13736-
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.7.0.tgz#8e7d2fbc0b57f8835d51195e957766969929616f"
13737-
integrity sha512-cwympNwQNnQZ/TffBd8yT0i0O10Cf/hlxccCYgUcwhcGEb9rDjE5thDbHoHw1hlJQUF/5ua7ERJe7Zr0lNE/ww==
13689+
turbo-darwin-64@1.8.5:
13690+
version "1.8.5"
13691+
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.8.5.tgz#6fdd2e9e2b8afead04e17380fc222863794e6007"
13692+
integrity sha512-CAYh56bzeHfnh7jTm03r29bh8p5a/EjQo1Id5yLUH7hS7msTau/+YpxJWPodLbN0UQsUYivUqHQkglJ+eMJ7xA==
13693+
13694+
turbo-darwin-arm64@1.8.5:
13695+
version "1.8.5"
13696+
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.5.tgz#8d72d67a87b6d247565de79477b0c7aed6a83c2b"
13697+
integrity sha512-R3jCPOv+lu3dcvMhj8b/Defv6dyUwX6W+tbX7d6YUCA46Plf/bGCQ8+MSbxmr/4E1GyGOVFsn1wRfiYk0us/Dg==
13698+
13699+
turbo-linux-64@1.8.5:
13700+
version "1.8.5"
13701+
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.8.5.tgz#a080015aa1c725604637a743a5b878d100aaf88b"
13702+
integrity sha512-YRc/KNRZeUVvth11UO4SDQZR2IqGgl9MSsbzqoHuFz4B4Q5QXH7onHogv9aXWE/BZBBbcrSBTlwBSG0Gg+J8hg==
13703+
13704+
turbo-linux-arm64@1.8.5:
13705+
version "1.8.5"
13706+
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.8.5.tgz#96fa915f10e81a16eccf74e122e96fcba4e132e0"
13707+
integrity sha512-8exVZb7XBl/V3gHSweuUyG2D9IzfWqwLvlXoeLWlVYSj61Ajgdv+WU7lvUmx+H2s+sSKqmIFmewA5Lw6YY37sg==
13708+
13709+
turbo-windows-64@1.8.5:
13710+
version "1.8.5"
13711+
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.8.5.tgz#14ca1a577e982c34fd606fa6499eaf4fea0eca36"
13712+
integrity sha512-fA8PU5ZNoFnQkapG06WiEqfsVQ5wbIPkIqTwUsd/M2Lp+KgxE79SQbuEI+2vQ9SmwM5qoMi515IPjgvXAJXgCw==
13713+
13714+
turbo-windows-arm64@1.8.5:
13715+
version "1.8.5"
13716+
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.8.5.tgz#286c7aacd8c9e2a8a0f5ab767268aadc8f6c7955"
13717+
integrity sha512-SW/NvIdhckLsAWjU/iqBbCB0S8kXupKscUK3kEW1DZIr3MYcP/yIuaE/IdPuqcoF3VP0I3TLD4VTYCCKAo3tKA==
13718+
13719+
turbo@^1.8.5:
13720+
version "1.8.5"
13721+
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.8.5.tgz#933413257783ede75471b8ebf2435ebc7be50ad7"
13722+
integrity sha512-UBnH2wIFb5g6OQCk8f34Ud15ZXV4xEMmugeDJTU5Ur2LpVRsNEny0isSCYdb3Iu3howoNyyXmtpaxWsAwNYkkg==
1373813723
optionalDependencies:
13739-
turbo-darwin-64 "1.7.0"
13740-
turbo-darwin-arm64 "1.7.0"
13741-
turbo-linux-64 "1.7.0"
13742-
turbo-linux-arm64 "1.7.0"
13743-
turbo-windows-64 "1.7.0"
13744-
turbo-windows-arm64 "1.7.0"
13724+
turbo-darwin-64 "1.8.5"
13725+
turbo-darwin-arm64 "1.8.5"
13726+
turbo-linux-64 "1.8.5"
13727+
turbo-linux-arm64 "1.8.5"
13728+
turbo-windows-64 "1.8.5"
13729+
turbo-windows-arm64 "1.8.5"
1374513730

1374613731
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
1374713732
version "0.14.5"

0 commit comments

Comments
 (0)