diff --git a/.changeset/renovate-a89c9df.md b/.changeset/renovate-a89c9df.md new file mode 100644 index 000000000..4893c78c0 --- /dev/null +++ b/.changeset/renovate-a89c9df.md @@ -0,0 +1,5 @@ +--- +'@scaleway/eslint-config-react': patch +--- + +Updated dependency `typescript` to `5.5.2`. diff --git a/package.json b/package.json index 93e5823a0..80a30d0fe 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "read-pkg": "9.0.1", "shx": "0.3.4", "tstyche": "2.0.0", - "typescript": "5.4.5", + "typescript": "5.5.2", "vite": "5.3.2", "vitest": "1.6.0", "vitest-localstorage-mock": "0.1.2", diff --git a/packages/use-dataloader/src/__tests__/dataloader.test.ts b/packages/use-dataloader/src/__tests__/dataloader.test.ts index 053e89260..90d24341b 100644 --- a/packages/use-dataloader/src/__tests__/dataloader.test.ts +++ b/packages/use-dataloader/src/__tests__/dataloader.test.ts @@ -77,11 +77,13 @@ describe('Dataloader class', () => { expect(instance.getData()).toBe(undefined) expect(notify).toBeCalledTimes(0) + // don't await as we will cancel this instance before instance.load().catch(() => null) expect(method).toBeCalledTimes(1) instance.cancel() expect(notify).toBeCalledTimes(0) + expect(instance.getData()).toBe(undefined) instance.clearData() }) @@ -153,11 +155,14 @@ describe('Dataloader class', () => { notifyChanges, }) - instance.load().catch(undefined) + expect(notifyChanges).toBeCalledTimes(0) + + await instance.load().catch(undefined) + expect(notifyChanges).toBeCalledTimes(1) instance.cancel() await waitForExpect(() => expect(instance.status).toBe(StatusEnum.IDLE)) - expect(notifyChanges).toBeCalledTimes(1) + expect(notifyChanges).toBeCalledTimes(2) }) test('should create instance with error and cancel', async () => { diff --git a/packages/use-dataloader/src/helpers.ts b/packages/use-dataloader/src/helpers.ts index fd272dc40..be548ef3b 100644 --- a/packages/use-dataloader/src/helpers.ts +++ b/packages/use-dataloader/src/helpers.ts @@ -16,7 +16,7 @@ export const marshalQueryKey = (queryKey: KeyType) => return subKey.toISOString() } - return subKey?.toString() + return subKey.toString() }) .join('.') : queryKey.toString() diff --git a/packages/use-i18n/src/usei18n.tsx b/packages/use-i18n/src/usei18n.tsx index b0a091f57..9491f142a 100644 --- a/packages/use-i18n/src/usei18n.tsx +++ b/packages/use-i18n/src/usei18n.tsx @@ -293,7 +293,7 @@ const I18nContextProvider = ({ const trad: Record = { ...result.defaultLocale.default, - ...result[currentLocale]?.default, + ...result[currentLocale].default, } setTranslations(prevState => ({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a5a92a527..7e25564f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,7 +37,7 @@ importers: version: 2.27.7 '@commitlint/cli': specifier: 19.3.0 - version: 19.3.0(@types/node@20.14.9)(typescript@5.4.5) + version: 19.3.0(@types/node@20.14.9)(typescript@5.5.2) '@commitlint/config-conventional': specifier: 19.2.2 version: 19.2.2 @@ -112,10 +112,10 @@ importers: version: 0.3.4 tstyche: specifier: 2.0.0 - version: 2.0.0(typescript@5.4.5) + version: 2.0.0(typescript@5.5.2) typescript: - specifier: 5.4.5 - version: 5.4.5 + specifier: 5.5.2 + version: 5.5.2 vite: specifier: 5.3.2 version: 5.3.2(@types/node@20.14.9) @@ -5081,6 +5081,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@5.5.2: + resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} + engines: {node: '>=14.17'} + hasBin: true + ufo@1.5.3: resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} @@ -6491,11 +6496,11 @@ snapshots: human-id: 1.0.2 prettier: 2.8.8 - '@commitlint/cli@19.3.0(@types/node@20.14.9)(typescript@5.4.5)': + '@commitlint/cli@19.3.0(@types/node@20.14.9)(typescript@5.5.2)': dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.2.0(@types/node@20.14.9)(typescript@5.4.5) + '@commitlint/load': 19.2.0(@types/node@20.14.9)(typescript@5.5.2) '@commitlint/read': 19.2.1 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -6542,15 +6547,15 @@ snapshots: '@commitlint/rules': 19.0.3 '@commitlint/types': 19.0.3 - '@commitlint/load@19.2.0(@types/node@20.14.9)(typescript@5.4.5)': + '@commitlint/load@19.2.0(@types/node@20.14.9)(typescript@5.5.2)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 '@commitlint/resolve-extends': 19.1.0 '@commitlint/types': 19.0.3 chalk: 5.3.0 - cosmiconfig: 9.0.0(typescript@5.4.5) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.9)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5) + cosmiconfig: 9.0.0(typescript@5.5.2) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.9)(cosmiconfig@9.0.0(typescript@5.5.2))(typescript@5.5.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -8468,21 +8473,21 @@ snapshots: dependencies: browserslist: 4.23.1 - cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.9)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5): + cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.9)(cosmiconfig@9.0.0(typescript@5.5.2))(typescript@5.5.2): dependencies: '@types/node': 20.14.9 - cosmiconfig: 9.0.0(typescript@5.4.5) + cosmiconfig: 9.0.0(typescript@5.5.2) jiti: 1.21.0 - typescript: 5.4.5 + typescript: 5.5.2 - cosmiconfig@9.0.0(typescript@5.4.5): + cosmiconfig@9.0.0(typescript@5.5.2): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.4.5 + typescript: 5.5.2 create-jest@29.7.0(@types/node@20.14.9): dependencies: @@ -11098,9 +11103,9 @@ snapshots: tslib@2.6.2: {} - tstyche@2.0.0(typescript@5.4.5): + tstyche@2.0.0(typescript@5.5.2): optionalDependencies: - typescript: 5.4.5 + typescript: 5.5.2 type-check@0.4.0: dependencies: @@ -11147,6 +11152,8 @@ snapshots: typescript@5.4.5: {} + typescript@5.5.2: {} + ufo@1.5.3: {} unbox-primitive@1.0.2: