From b3dc9a9f2c79a0e92d3143f915ebf011bff570af Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 6 Mar 2024 13:37:21 -0600 Subject: [PATCH 1/4] Bump TypeScript to 5.4 --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 374759e2..4693321d 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "rimraf": "^3.0.2", "shelljs": "^0.8.5", "tsup": "^6.7.0", - "typescript": "5.2", + "typescript": "^5.4.2", "vitest": "^1.1.1" } } diff --git a/yarn.lock b/yarn.lock index 5b64380c..af6cfcbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4256,7 +4256,7 @@ __metadata: rimraf: ^3.0.2 shelljs: ^0.8.5 tsup: ^6.7.0 - typescript: 5.2 + typescript: ^5.4.2 vitest: ^1.1.1 languageName: unknown linkType: soft @@ -5108,23 +5108,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" +"typescript@npm:^5.4.2": + version: 5.4.2 + resolution: "typescript@npm:5.4.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + checksum: 96d80fde25a09bcb04d399082fb27a808a9e17c2111e43849d2aafbd642d835e4f4ef0de09b0ba795ec2a700be6c4c2c3f62bf4660c05404c948727b5bbfb32a languageName: node linkType: hard -"typescript@patch:typescript@5.2#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=701156" +"typescript@patch:typescript@^5.4.2#~builtin": + version: 5.4.2 + resolution: "typescript@patch:typescript@npm%3A5.4.2#~builtin::version=5.4.2&hash=701156" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554 + checksum: c1b669146bca5529873aae60870e243fa8140c85f57ca32c42f898f586d73ce4a6b4f6bb02ae312729e214d7f5859a0c70da3e527a116fdf5ad00c9fc733ecc6 languageName: node linkType: hard From d53a928b0c5b94dc258224c1b6a9739f33342958 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 6 Mar 2024 13:38:04 -0600 Subject: [PATCH 2/4] Add TypeScript 5.4 to TS versions to test against during CI --- .github/workflows/build-and-test-types.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-types.yml b/.github/workflows/build-and-test-types.yml index 3cf8f83b..9daee889 100644 --- a/.github/workflows/build-and-test-types.yml +++ b/.github/workflows/build-and-test-types.yml @@ -57,7 +57,7 @@ jobs: fail-fast: false matrix: node: ['18.x'] - ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2', '5.3'] + ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2', '5.3', '5.4'] steps: - name: Checkout repo From 8624459313bf1c524def0a4d50ad3a3c8126fc40 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 6 Mar 2024 13:42:33 -0600 Subject: [PATCH 3/4] Fix TS 5.4 issue related to using `arguments` in `createSelectorCreator` --- src/createSelectorCreator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/createSelectorCreator.ts b/src/createSelectorCreator.ts index d98b8672..6a9e8e62 100644 --- a/src/createSelectorCreator.ts +++ b/src/createSelectorCreator.ts @@ -391,7 +391,7 @@ export function createSelectorCreator< // @ts-ignore return (resultFunc as Combiner).apply( null, - arguments + arguments as unknown as Parameters> ) }, ...finalMemoizeOptions) as Combiner & ExtractMemoizerFields From 5604d988699b6798de4d4eba712f98cded52bc3b Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Wed, 6 Mar 2024 14:13:13 -0600 Subject: [PATCH 4/4] Bump `actions/setup-node` usages to v4 --- .github/workflows/build-and-test-types.yml | 6 +++--- .github/workflows/publish.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-types.yml b/.github/workflows/build-and-test-types.yml index 9daee889..52718594 100644 --- a/.github/workflows/build-and-test-types.yml +++ b/.github/workflows/build-and-test-types.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Set up Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 18.x cache: 'yarn' @@ -64,7 +64,7 @@ jobs: uses: actions/checkout@v3 - name: Use node ${{ matrix.node }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} cache: 'yarn' @@ -142,7 +142,7 @@ jobs: uses: actions/checkout@v4 - name: Use node ${{ matrix.node }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} cache: 'yarn' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c07bc8ff..0e423ead 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: contents: read steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18.x' registry-url: 'https://registry.npmjs.org'