From 0f38dde7a7f0ea79fc24835fc87e13ac39eaf4cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:26:57 +0000 Subject: [PATCH 1/2] chore: bump typescript from 5.5.4 to 5.6.2 in /site Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.6.2. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- site/package.json | 2 +- site/pnpm-lock.yaml | 108 ++++++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/site/package.json b/site/package.json index e383b440c6b94..97bda643202d8 100644 --- a/site/package.json +++ b/site/package.json @@ -160,7 +160,7 @@ "ts-node": "10.9.1", "ts-proto": "1.164.0", "ts-prune": "0.10.3", - "typescript": "5.5.4", + "typescript": "5.6.2", "vite": "5.4.6", "vite-plugin-checker": "0.7.2", "vite-plugin-turbosnap": "1.0.3" diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 2f2a67363923a..7ed302527e616 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -231,7 +231,7 @@ importers: version: 8.1.11(@types/react-dom@18.3.0)(@types/react@18.3.10)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@storybook/addon-interactions': specifier: 8.1.11 - version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))) + version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))) '@storybook/addon-links': specifier: 8.1.11 version: 8.1.11(react@18.3.1) @@ -246,13 +246,13 @@ importers: version: 8.1.11 '@storybook/react': specifier: 8.1.11 - version: 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4) + version: 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2) '@storybook/react-vite': specifier: 8.1.11 - version: 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.20.0)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10)) + version: 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.20.0)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10)) '@storybook/test': specifier: 8.1.11 - version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))) + version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))) '@swc/core': specifier: 1.3.38 version: 1.3.38 @@ -261,7 +261,7 @@ importers: version: 0.2.24(@swc/core@1.3.38) '@testing-library/jest-dom': specifier: 6.4.6 - version: 6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))) + version: 6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))) '@testing-library/react': specifier: 14.1.0 version: 14.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -339,7 +339,7 @@ importers: version: 4.20.0 jest: specifier: 29.7.0 - version: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + version: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) jest-canvas-mock: specifier: 2.5.2 version: 2.5.2 @@ -357,7 +357,7 @@ importers: version: 0.1.14(@swc/core@1.3.38)(@swc/jest@0.2.24(@swc/core@1.3.38)) msw: specifier: 2.3.5 - version: 2.3.5(typescript@5.5.4) + version: 2.3.5(typescript@5.6.2) prettier: specifier: 3.3.3 version: 3.3.3 @@ -381,7 +381,7 @@ importers: version: 0.6.0(react-dom@18.3.1(react@18.3.1)) ts-node: specifier: 10.9.1 - version: 10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4) + version: 10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2) ts-proto: specifier: 1.164.0 version: 1.164.0 @@ -389,14 +389,14 @@ importers: specifier: 0.10.3 version: 0.10.3 typescript: - specifier: 5.5.4 - version: 5.5.4 + specifier: 5.6.2 + version: 5.6.2 vite: specifier: 5.4.6 version: 5.4.6(@types/node@20.16.10) vite-plugin-checker: specifier: 0.7.2 - version: 0.7.2(@biomejs/biome@1.9.3)(eslint@8.52.0)(optionator@0.9.3)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10)) + version: 0.7.2(@biomejs/biome@1.9.3)(eslint@8.52.0)(optionator@0.9.3)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10)) vite-plugin-turbosnap: specifier: 1.0.3 version: 1.0.3 @@ -6616,8 +6616,8 @@ packages: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} - typescript@5.5.4: - resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} hasBin: true @@ -8591,7 +8591,7 @@ snapshots: jest-util: 29.7.0 slash: 3.0.0 - '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))': + '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))': dependencies: '@jest/console': 29.7.0 '@jest/reporters': 29.7.0 @@ -8605,7 +8605,7 @@ snapshots: exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -8781,15 +8781,15 @@ snapshots: '@types/yargs': 17.0.33 chalk: 4.1.2 - '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10))': + '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10))': dependencies: glob: 7.2.3 glob-promise: 4.2.2(glob@7.2.3) magic-string: 0.27.0 - react-docgen-typescript: 2.2.2(typescript@5.5.4) + react-docgen-typescript: 2.2.2(typescript@5.6.2) vite: 5.4.6(@types/node@20.16.10) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 '@jridgewell/gen-mapping@0.3.5': dependencies: @@ -9359,11 +9359,11 @@ snapshots: dependencies: '@storybook/global': 5.0.0 - '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)))': + '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)))': dependencies: '@storybook/global': 5.0.0 '@storybook/instrumenter': 8.1.11 - '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))) + '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))) '@storybook/types': 8.1.11 polished: 4.2.2 ts-dedent: 2.2.0 @@ -9505,7 +9505,7 @@ snapshots: - prettier - supports-color - '@storybook/builder-vite@8.1.11(prettier@3.3.3)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10))': + '@storybook/builder-vite@8.1.11(prettier@3.3.3)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10))': dependencies: '@storybook/channels': 8.1.11 '@storybook/client-logger': 8.1.11 @@ -9526,7 +9526,7 @@ snapshots: ts-dedent: 2.2.0 vite: 5.4.6(@types/node@20.16.10) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - encoding - prettier @@ -9854,13 +9854,13 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@storybook/react-vite@8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.20.0)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10))': + '@storybook/react-vite@8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.20.0)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10))': dependencies: - '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10)) + '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10)) '@rollup/pluginutils': 5.0.5(rollup@4.20.0) - '@storybook/builder-vite': 8.1.11(prettier@3.3.3)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10)) + '@storybook/builder-vite': 8.1.11(prettier@3.3.3)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10)) '@storybook/node-logger': 8.1.11 - '@storybook/react': 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4) + '@storybook/react': 8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2) '@storybook/types': 8.1.11 find-up: 5.0.0 magic-string: 0.30.5 @@ -9879,7 +9879,7 @@ snapshots: - typescript - vite-plugin-glimmerx - '@storybook/react@8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4)': + '@storybook/react@8.1.11(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)': dependencies: '@storybook/client-logger': 8.1.11 '@storybook/docs-tools': 8.1.11(prettier@3.3.3) @@ -9905,7 +9905,7 @@ snapshots: type-fest: 2.19.0 util-deprecate: 1.0.2 optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - encoding - prettier @@ -9947,14 +9947,14 @@ snapshots: - prettier - supports-color - '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)))': + '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)))': dependencies: '@storybook/client-logger': 8.1.11 '@storybook/core-events': 8.1.11 '@storybook/instrumenter': 8.1.11 '@storybook/preview-api': 8.1.11 '@testing-library/dom': 10.1.0 - '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4))) + '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2))) '@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0) '@vitest/expect': 1.6.0 '@vitest/spy': 1.6.0 @@ -10085,7 +10085,7 @@ snapshots: lz-string: 1.5.0 pretty-format: 27.5.1 - '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)))': + '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)))': dependencies: '@adobe/css-tools': 4.3.2 '@babel/runtime': 7.25.4 @@ -10098,9 +10098,9 @@ snapshots: optionalDependencies: '@jest/globals': 29.7.0 '@types/jest': 29.5.13 - jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) - '@testing-library/jest-dom@6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)))': + '@testing-library/jest-dom@6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.13)(jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)))': dependencies: '@adobe/css-tools': 4.4.0 '@babel/runtime': 7.24.7 @@ -10113,7 +10113,7 @@ snapshots: optionalDependencies: '@jest/globals': 29.7.0 '@types/jest': 29.5.13 - jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) '@testing-library/react-hooks@8.0.1(@types/react@18.3.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -11099,13 +11099,13 @@ snapshots: nan: 2.20.0 optional: true - create-jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)): + create-jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -12332,16 +12332,16 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)): + jest-cli@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)): dependencies: - '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + create-jest: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) exit: 0.1.2 import-local: 3.2.0 - jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest-config: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -12351,7 +12351,7 @@ snapshots: - supports-color - ts-node - jest-config@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)): + jest-config@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)): dependencies: '@babel/core': 7.25.2 '@jest/test-sequencer': 29.7.0 @@ -12377,7 +12377,7 @@ snapshots: strip-json-comments: 3.1.1 optionalDependencies: '@types/node': 20.16.10 - ts-node: 10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4) + ts-node: 10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -12660,12 +12660,12 @@ snapshots: merge-stream: 2.0.0 supports-color: 8.1.1 - jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)): + jest@29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)): dependencies: - '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) '@jest/types': 29.6.3 import-local: 3.2.0 - jest-cli: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4)) + jest-cli: 29.7.0(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2)) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -13299,7 +13299,7 @@ snapshots: ms@2.1.3: {} - msw@2.3.5(typescript@5.5.4): + msw@2.3.5(typescript@5.6.2): dependencies: '@bundled-es-modules/cookie': 2.0.0 '@bundled-es-modules/statuses': 1.0.1 @@ -13319,7 +13319,7 @@ snapshots: type-fest: 4.11.1 yargs: 17.7.2 optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 mute-stream@1.0.0: {} @@ -13738,9 +13738,9 @@ snapshots: react-list: 0.8.17(react@18.3.1) shallow-equal: 1.2.1 - react-docgen-typescript@2.2.2(typescript@5.5.4): + react-docgen-typescript@2.2.2(typescript@5.6.2): dependencies: - typescript: 5.5.4 + typescript: 5.6.2 react-docgen@7.0.3: dependencies: @@ -14562,7 +14562,7 @@ snapshots: '@ts-morph/common': 0.12.3 code-block-writer: 11.0.3 - ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.5.4): + ts-node@10.9.1(@swc/core@1.3.38)(@types/node@20.16.10)(typescript@5.6.2): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 @@ -14576,7 +14576,7 @@ snapshots: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.5.4 + typescript: 5.6.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 optionalDependencies: @@ -14654,7 +14654,7 @@ snapshots: media-typer: 0.3.0 mime-types: 2.1.35 - typescript@5.5.4: {} + typescript@5.6.2: {} tzdata@1.0.40: {} @@ -14817,7 +14817,7 @@ snapshots: unist-util-stringify-position: 4.0.0 vfile-message: 4.0.2 - vite-plugin-checker@0.7.2(@biomejs/biome@1.9.3)(eslint@8.52.0)(optionator@0.9.3)(typescript@5.5.4)(vite@5.4.6(@types/node@20.16.10)): + vite-plugin-checker@0.7.2(@biomejs/biome@1.9.3)(eslint@8.52.0)(optionator@0.9.3)(typescript@5.6.2)(vite@5.4.6(@types/node@20.16.10)): dependencies: '@babel/code-frame': 7.24.7 ansi-escapes: 4.3.2 @@ -14838,7 +14838,7 @@ snapshots: '@biomejs/biome': 1.9.3 eslint: 8.52.0 optionator: 0.9.3 - typescript: 5.5.4 + typescript: 5.6.2 vite-plugin-turbosnap@1.0.3: {} From 81d1a731a4db680bbe57649f504baff019e62599 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 1 Oct 2024 21:48:53 +0000 Subject: [PATCH 2/2] just do the thing --- site/src/components/Filter/UserFilter.tsx | 5 +---- site/src/components/Filter/menu.ts | 20 +++++++++---------- site/src/modules/tableFiltering/options.tsx | 2 +- site/src/pages/AuditPage/AuditFilter.tsx | 4 ++-- site/src/pages/UsersPage/UsersFilter.tsx | 2 +- .../src/pages/WorkspacesPage/filter/menus.tsx | 6 +++--- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/site/src/components/Filter/UserFilter.tsx b/site/src/components/Filter/UserFilter.tsx index 3bd5936bfcb7a..015bc3d71d439 100644 --- a/site/src/components/Filter/UserFilter.tsx +++ b/site/src/components/Filter/UserFilter.tsx @@ -13,10 +13,7 @@ export const useUserFilterMenu = ({ value, onChange, enabled, -}: Pick< - UseFilterMenuOptions, - "value" | "onChange" | "enabled" ->) => { +}: Pick) => { const { user: me } = useAuthenticated(); const addMeAsFirstOption = (options: readonly SelectFilterOption[]) => { diff --git a/site/src/components/Filter/menu.ts b/site/src/components/Filter/menu.ts index 1dca0df4db779..f643e5110348a 100644 --- a/site/src/components/Filter/menu.ts +++ b/site/src/components/Filter/menu.ts @@ -2,28 +2,28 @@ import type { SelectFilterOption } from "components/Filter/SelectFilter"; import { useMemo, useRef, useState } from "react"; import { useQuery } from "react-query"; -export type UseFilterMenuOptions = { +export type UseFilterMenuOptions = { id: string; value: string | undefined; // Using null because of react-query // https://tanstack.com/query/v4/docs/react/guides/migrating-to-react-query-4#undefined-is-an-illegal-cache-value-for-successful-queries - getSelectedOption: () => Promise; - getOptions: (query: string) => Promise; - onChange: (option: TOption | undefined) => void; + getSelectedOption: () => Promise; + getOptions: (query: string) => Promise; + onChange: (option: SelectFilterOption | undefined) => void; enabled?: boolean; }; -export const useFilterMenu = < - TOption extends SelectFilterOption = SelectFilterOption, ->({ +export const useFilterMenu = ({ id, value, getSelectedOption, getOptions, onChange, enabled, -}: UseFilterMenuOptions) => { - const selectedOptionsCacheRef = useRef>({}); +}: UseFilterMenuOptions) => { + const selectedOptionsCacheRef = useRef>( + {}, + ); const [query, setQuery] = useState(""); const selectedOptionQuery = useQuery({ queryKey: [id, "autocomplete", "selected", value], @@ -80,7 +80,7 @@ export const useFilterMenu = < selectedOption, ]); - const selectOption = (option: TOption | undefined) => { + const selectOption = (option: SelectFilterOption | undefined) => { if (option) { selectedOptionsCacheRef.current[option.value] = option; } diff --git a/site/src/modules/tableFiltering/options.tsx b/site/src/modules/tableFiltering/options.tsx index 3eac5b92a184a..f6f98770f4a71 100644 --- a/site/src/modules/tableFiltering/options.tsx +++ b/site/src/modules/tableFiltering/options.tsx @@ -25,7 +25,7 @@ import type { FC } from "react"; export const useOrganizationsFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { return useFilterMenu({ onChange, value, diff --git a/site/src/pages/AuditPage/AuditFilter.tsx b/site/src/pages/AuditPage/AuditFilter.tsx index 448a59e88dc8d..1d18cdaeedb2b 100644 --- a/site/src/pages/AuditPage/AuditFilter.tsx +++ b/site/src/pages/AuditPage/AuditFilter.tsx @@ -81,7 +81,7 @@ export const AuditFilter: FC = ({ filter, error, menus }) => { export const useActionFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { const actionOptions: SelectFilterOption[] = AuditActions.map((action) => ({ value: action, label: capitalize(action), @@ -119,7 +119,7 @@ const ActionMenu: FC = ({ menu, width }) => { export const useResourceTypeFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { const actionOptions: SelectFilterOption[] = ResourceTypes.map((type) => { let label = capitalize(type); diff --git a/site/src/pages/UsersPage/UsersFilter.tsx b/site/src/pages/UsersPage/UsersFilter.tsx index dd6083652d56b..5f600670dc044 100644 --- a/site/src/pages/UsersPage/UsersFilter.tsx +++ b/site/src/pages/UsersPage/UsersFilter.tsx @@ -19,7 +19,7 @@ const userFilterQuery = { export const useStatusFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { const statusOptions: SelectFilterOption[] = [ { value: "active", diff --git a/site/src/pages/WorkspacesPage/filter/menus.tsx b/site/src/pages/WorkspacesPage/filter/menus.tsx index 50a3b5ff3cea2..7a2d79c606e1f 100644 --- a/site/src/pages/WorkspacesPage/filter/menus.tsx +++ b/site/src/pages/WorkspacesPage/filter/menus.tsx @@ -17,7 +17,7 @@ import { getDisplayWorkspaceStatus } from "utils/workspace"; export const useTemplateFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { return useFilterMenu({ onChange, value, @@ -31,7 +31,7 @@ export const useTemplateFilterMenu = ({ label: template.display_name || template.name, value: template.name, startIcon: , - }; + } satisfies SelectFilterOption; } return null; }, @@ -86,7 +86,7 @@ export const TemplateMenu: FC = ({ width, menu }) => { export const useStatusFilterMenu = ({ value, onChange, -}: Pick, "value" | "onChange">) => { +}: Pick) => { const statusesToFilter: WorkspaceStatus[] = [ "running", "stopped",