Skip to content

Commit 422b3af

Browse files
flevi29flevi29
committed
Adapt to changes from main, update packages
1 parent d874a41 commit 422b3af

File tree

4 files changed

+72
-67
lines changed

4 files changed

+72
-67
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
// @TODO: Can be removed, ES versions are cumulative:
77
// https://stackoverflow.com/a/61688878
88
// es6: true,
9-
// This seems to be what Node.js 20 fully supports, but online documentation
9+
// This seems to be what Node.js 18, 20 fully supports, but online documentation
1010
// isn't exactly crystal clear about what should be put here
1111
es2022: true,
1212
browser: true,

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"test:env:esm": "yarn --cwd tests/env/esm && yarn --cwd tests/env/esm start",
4949
"test:env:nitro-app": "yarn build && yarn --cwd tests/env/nitro-app test",
5050
"size": "node scripts/file-size ./dist/bundles/meilisearch.esm.min.js ./dist/bundles/meilisearch.umd.min.js",
51-
"style": "yarn lint && yarn fmt",
52-
"style:fix": "yarn lint:fix && yarn fmt:fix",
51+
"style": "yarn fmt && yarn lint",
52+
"style:fix": "yarn fmt:fix && yarn lint:fix",
5353
"fmt": "prettier -c ./**/*.{js,ts,tsx}",
5454
"fmt:fix": "prettier -w ./**/*.{js,ts,tsx}",
5555
"lint": "eslint --ext .js,.ts,.tsx .",
@@ -82,13 +82,13 @@
8282
"@rollup/plugin-json": "^6.0.0",
8383
"@rollup/plugin-node-resolve": "15.1.0",
8484
"@types/jest": "^29.5.11",
85-
"@typescript-eslint/eslint-plugin": "^6.16.0",
86-
"@typescript-eslint/parser": "^6.16.0",
85+
"@typescript-eslint/eslint-plugin": "^6.19.0",
86+
"@typescript-eslint/parser": "^6.19.0",
8787
"abort-controller": "^3.0.0",
8888
"brotli-size": "^4.0.0",
8989
"eslint": "^8.56.0",
9090
"eslint-config-prettier": "^9.1.0",
91-
"eslint-plugin-jest": "^27.6.1",
91+
"eslint-plugin-jest": "^27.6.3",
9292
"eslint-plugin-tsdoc": "^0.2.17",
9393
"gzip-size": "^6.0.0",
9494
"jest": "^29.7.0",
@@ -98,7 +98,7 @@
9898
"kleur": "^4.1.5",
9999
"lint-staged": "11.1.2",
100100
"nodemon": "^2.0.16",
101-
"prettier": "^3.1.1",
101+
"prettier": "^3.2.3",
102102
"prettier-plugin-jsdoc": "^1.3.0",
103103
"pretty-bytes": "^5.6.0",
104104
"rollup": "^2.79.1",

‎tsconfig.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
// Since we're using a bundler (rollup), and so TS isn't used to emit JS,
2020
// this option should be set to "bundler"
2121
// https://www.typescriptlang.org/docs/handbook/modules/reference.html#bundler
22+
// However "module": "node16" or "nodenext" is a better option:
23+
// https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution-for-libraries
24+
// Problem is, a lot of files would need changes, so to keep things simpler for now let's keep it as "bundler"
25+
// Also this should be applied too: https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax
26+
// but again, too many changes for now
2227
"moduleResolution": "bundler",
2328
// "moduleResolution" = "bundler" requires this to be "esnext"
2429
"module": "esnext",
@@ -28,10 +33,10 @@
2833
// "esModuleInterop": true,
2934
// @TODO: Remove, as "moduleResolution": "bundler" sets this to true
3035
// "allowSyntheticDefaultImports": true,
31-
// Node.js 14 (the EOL one still tested on by us) supports up to ES2020 according to https://www.npmjs.com/package/@tsconfig/node14
36+
// Node.js 18 supports up to ES2022 according to https://www.npmjs.com/package/@tsconfig/node18
3237
// This matters for the generated CJS and ESM file, UMD file is down-leveled further to support IE11
3338
// with the help of Babel.
34-
"target": "es2020",
39+
"target": "es2022",
3540
"lib": [
3641
// @TODO: Remove as ES versions are cumulative, so ESNext contains everything
3742
//"ES2019",

‎yarn.lock‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,32 +1992,32 @@
19921992
dependencies:
19931993
"@types/yargs-parser" "*"
19941994

1995-
"@typescript-eslint/eslint-plugin@^6.16.0":
1996-
version "6.18.0"
1997-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.0.tgz#94b86f3c25b468c714a04bd490017ecec2fd3746"
1998-
integrity sha512-3lqEvQUdCozi6d1mddWqd+kf8KxmGq2Plzx36BlkjuQe3rSTm/O98cLf0A4uDO+a5N1KD2SeEEl6fW97YHY+6w==
1995+
"@typescript-eslint/eslint-plugin@^6.19.0":
1996+
version "6.19.0"
1997+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz#db03f3313b57a30fbbdad2e6929e88fc7feaf9ba"
1998+
integrity sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==
19991999
dependencies:
20002000
"@eslint-community/regexpp" "^4.5.1"
2001-
"@typescript-eslint/scope-manager" "6.18.0"
2002-
"@typescript-eslint/type-utils" "6.18.0"
2003-
"@typescript-eslint/utils" "6.18.0"
2004-
"@typescript-eslint/visitor-keys" "6.18.0"
2001+
"@typescript-eslint/scope-manager" "6.19.0"
2002+
"@typescript-eslint/type-utils" "6.19.0"
2003+
"@typescript-eslint/utils" "6.19.0"
2004+
"@typescript-eslint/visitor-keys" "6.19.0"
20052005
debug "^4.3.4"
20062006
graphemer "^1.4.0"
20072007
ignore "^5.2.4"
20082008
natural-compare "^1.4.0"
20092009
semver "^7.5.4"
20102010
ts-api-utils "^1.0.1"
20112011

2012-
"@typescript-eslint/parser@^6.16.0":
2013-
version "6.18.0"
2014-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.0.tgz#d494161d64832e869f0a6acc6000a2cdff858383"
2015-
integrity sha512-v6uR68SFvqhNQT41frCMCQpsP+5vySy6IdgjlzUWoo7ALCnpaWYcz/Ij2k4L8cEsL0wkvOviCMpjmtRtHNOKzA==
2012+
"@typescript-eslint/parser@^6.19.0":
2013+
version "6.19.0"
2014+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.0.tgz#80344086f362181890ade7e94fc35fe0480bfdf5"
2015+
integrity sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==
20162016
dependencies:
2017-
"@typescript-eslint/scope-manager" "6.18.0"
2018-
"@typescript-eslint/types" "6.18.0"
2019-
"@typescript-eslint/typescript-estree" "6.18.0"
2020-
"@typescript-eslint/visitor-keys" "6.18.0"
2017+
"@typescript-eslint/scope-manager" "6.19.0"
2018+
"@typescript-eslint/types" "6.19.0"
2019+
"@typescript-eslint/typescript-estree" "6.19.0"
2020+
"@typescript-eslint/visitor-keys" "6.19.0"
20212021
debug "^4.3.4"
20222022

20232023
"@typescript-eslint/[email protected]":
@@ -2028,21 +2028,21 @@
20282028
"@typescript-eslint/types" "5.62.0"
20292029
"@typescript-eslint/visitor-keys" "5.62.0"
20302030

2031-
"@typescript-eslint/scope-manager@6.18.0":
2032-
version "6.18.0"
2033-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.0.tgz#24ca6fc1f4a2afa71122dcfca9282878687d9997"
2034-
integrity sha512-o/UoDT2NgOJ2VfHpfr+KBY2ErWvCySNUIX/X7O9g8Zzt/tXdpfEU43qbNk8LVuWUT2E0ptzTWXh79i74PP0twA==
2031+
"@typescript-eslint/scope-manager@6.19.0":
2032+
version "6.19.0"
2033+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
2034+
integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
20352035
dependencies:
2036-
"@typescript-eslint/types" "6.18.0"
2037-
"@typescript-eslint/visitor-keys" "6.18.0"
2036+
"@typescript-eslint/types" "6.19.0"
2037+
"@typescript-eslint/visitor-keys" "6.19.0"
20382038

2039-
"@typescript-eslint/type-utils@6.18.0":
2040-
version "6.18.0"
2041-
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.0.tgz#a492da599da5c38c70aa9ff9bfb473961b8ae663"
2042-
integrity sha512-ZeMtrXnGmTcHciJN1+u2CigWEEXgy1ufoxtWcHORt5kGvpjjIlK9MUhzHm4RM8iVy6dqSaZA/6PVkX6+r+ChjQ==
2039+
"@typescript-eslint/type-utils@6.19.0":
2040+
version "6.19.0"
2041+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
2042+
integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==
20432043
dependencies:
2044-
"@typescript-eslint/typescript-estree" "6.18.0"
2045-
"@typescript-eslint/utils" "6.18.0"
2044+
"@typescript-eslint/typescript-estree" "6.19.0"
2045+
"@typescript-eslint/utils" "6.19.0"
20462046
debug "^4.3.4"
20472047
ts-api-utils "^1.0.1"
20482048

@@ -2051,10 +2051,10 @@
20512051
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
20522052
integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
20532053

2054-
"@typescript-eslint/types@6.18.0":
2055-
version "6.18.0"
2056-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101"
2057-
integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA==
2054+
"@typescript-eslint/types@6.19.0":
2055+
version "6.19.0"
2056+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
2057+
integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
20582058

20592059
"@typescript-eslint/[email protected]":
20602060
version "5.62.0"
@@ -2069,31 +2069,31 @@
20692069
semver "^7.3.7"
20702070
tsutils "^3.21.0"
20712071

2072-
"@typescript-eslint/typescript-estree@6.18.0":
2073-
version "6.18.0"
2074-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a"
2075-
integrity sha512-klNvl+Ql4NsBNGB4W9TZ2Od03lm7aGvTbs0wYaFYsplVPhr+oeXjlPZCDI4U9jgJIDK38W1FKhacCFzCC+nbIg==
2072+
"@typescript-eslint/typescript-estree@6.19.0":
2073+
version "6.19.0"
2074+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
2075+
integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
20762076
dependencies:
2077-
"@typescript-eslint/types" "6.18.0"
2078-
"@typescript-eslint/visitor-keys" "6.18.0"
2077+
"@typescript-eslint/types" "6.19.0"
2078+
"@typescript-eslint/visitor-keys" "6.19.0"
20792079
debug "^4.3.4"
20802080
globby "^11.1.0"
20812081
is-glob "^4.0.3"
20822082
minimatch "9.0.3"
20832083
semver "^7.5.4"
20842084
ts-api-utils "^1.0.1"
20852085

2086-
"@typescript-eslint/utils@6.18.0":
2087-
version "6.18.0"
2088-
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.0.tgz#4d07c9c08f84b9939a1aca7aef98c8f378936142"
2089-
integrity sha512-wiKKCbUeDPGaYEYQh1S580dGxJ/V9HI7K5sbGAVklyf+o5g3O+adnS4UNJajplF4e7z2q0uVBaTdT/yLb4XAVA==
2086+
"@typescript-eslint/utils@6.19.0":
2087+
version "6.19.0"
2088+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
2089+
integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==
20902090
dependencies:
20912091
"@eslint-community/eslint-utils" "^4.4.0"
20922092
"@types/json-schema" "^7.0.12"
20932093
"@types/semver" "^7.5.0"
2094-
"@typescript-eslint/scope-manager" "6.18.0"
2095-
"@typescript-eslint/types" "6.18.0"
2096-
"@typescript-eslint/typescript-estree" "6.18.0"
2094+
"@typescript-eslint/scope-manager" "6.19.0"
2095+
"@typescript-eslint/types" "6.19.0"
2096+
"@typescript-eslint/typescript-estree" "6.19.0"
20972097
semver "^7.5.4"
20982098

20992099
"@typescript-eslint/utils@^5.10.0":
@@ -2118,12 +2118,12 @@
21182118
"@typescript-eslint/types" "5.62.0"
21192119
eslint-visitor-keys "^3.3.0"
21202120

2121-
"@typescript-eslint/visitor-keys@6.18.0":
2122-
version "6.18.0"
2123-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.0.tgz#3c8733737786fa6c78a347b4fa306ae7155b560f"
2124-
integrity sha512-1wetAlSZpewRDb2h9p/Q8kRjdGuqdTAQbkJIOUMLug2LBLG+QOjiWoSj6/3B/hA9/tVTFFdtiKvAYoYnSRW/RA==
2121+
"@typescript-eslint/visitor-keys@6.19.0":
2122+
version "6.19.0"
2123+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
2124+
integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
21252125
dependencies:
2126-
"@typescript-eslint/types" "6.18.0"
2126+
"@typescript-eslint/types" "6.19.0"
21272127
eslint-visitor-keys "^3.4.1"
21282128

21292129
"@ungap/structured-clone@^1.2.0":
@@ -3052,10 +3052,10 @@ eslint-config-prettier@^9.1.0:
30523052
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
30533053
integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
30543054

3055-
eslint-plugin-jest@^27.6.1:
3056-
version "27.6.1"
3057-
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.1.tgz#5e43b07f3ca48d72e4b4fa243531e5153d9ca1dc"
3058-
integrity sha512-WEYkyVXD9NlmFBKvrkmzrC+C9yZoz5pAml2hO19PlS3spJtoiwj4p2u8spd/7zx5IvRsZsCmsoImaAvBB9X93Q==
3055+
eslint-plugin-jest@^27.6.3:
3056+
version "27.6.3"
3057+
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.3.tgz#8acb8b1e45597fe1f4d4cf25163d90119efc12be"
3058+
integrity sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA==
30593059
dependencies:
30603060
"@typescript-eslint/utils" "^5.10.0"
30613061

@@ -5129,10 +5129,10 @@ prettier-plugin-jsdoc@^1.3.0:
51295129
comment-parser "^1.4.0"
51305130
mdast-util-from-markdown "^2.0.0"
51315131

5132-
prettier@^3.1.1:
5133-
version "3.1.1"
5134-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848"
5135-
integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==
5132+
prettier@^3.2.3:
5133+
version "3.2.3"
5134+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.3.tgz#98501d99141a9a10d5ceaf74cf39c8b7cbddd380"
5135+
integrity sha512-QNhUTBq+mqt1oH1dTfY3phOKNhcDdJkfttHI6u0kj7M2+c+7fmNKlgh2GhnHiqMcbxJ+a0j2igz/2jfl9QKLuw==
51365136

51375137
pretty-bytes@^5.6.0:
51385138
version "5.6.0"

0 commit comments

Comments
 (0)