From 93ba62359c9c83de29c11a8a0bc49e58ec159b0d Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 5 Jan 2024 21:39:20 +1100 Subject: [PATCH 1/2] fix: Correctly exit publish script --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- scripts/publish.js | 5 +---- tsconfig.json | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index a307355f16..3e90829511 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "namespace": "@tanstack", "devDependencies": { "@solidjs/testing-library": "^0.8.5", - "@tanstack/config": "^0.1.6", + "@tanstack/config": "^0.1.7", "@testing-library/jest-dom": "^6.1.5", "@testing-library/react": "^14.1.2", "@types/eslint": "^8.56.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92496cd8ff..208491a337 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,8 +17,8 @@ importers: specifier: ^0.8.5 version: 0.8.5(@solidjs/router@0.10.5)(solid-js@1.8.7) '@tanstack/config': - specifier: ^0.1.6 - version: 0.1.6(@types/node@18.19.3)(esbuild@0.19.10)(typescript@5.2.2)(vite@5.0.10) + specifier: ^0.1.7 + version: 0.1.7(@types/node@18.19.3)(esbuild@0.19.10)(typescript@5.2.2)(vite@5.0.10) '@testing-library/jest-dom': specifier: ^6.1.5 version: 6.1.5(vitest@1.1.0) @@ -9343,8 +9343,8 @@ packages: tslib: 2.6.2 dev: true - /@tanstack/config@0.1.6(@types/node@18.19.3)(esbuild@0.19.10)(typescript@5.2.2)(vite@5.0.10): - resolution: {integrity: sha512-QNyg/wawvs/idXFdECbHfyDC3TZ8nznrM/Zz75J41+YU1TUcBy7QZvjVw2NT97SPsKvnoXxWJjg/YPzxn9p1ZQ==} + /@tanstack/config@0.1.7(@types/node@18.19.3)(esbuild@0.19.10)(typescript@5.2.2)(vite@5.0.10): + resolution: {integrity: sha512-+IbRTGbIEuWSNbouink96KL9aEGwhNzzy7DXtYg6CgCU5fpiGCIuNm7pGddEloTW1hHv+vvlqhlfx63F6ueWuA==} engines: {node: '>=18'} hasBin: true dependencies: diff --git a/scripts/publish.js b/scripts/publish.js index 9d3288b65a..3a8462ae3c 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -3,14 +3,11 @@ import { publish } from '@tanstack/config/publish' import { branchConfigs, packages, rootDir } from './config.js' -publish({ +await publish({ branchConfigs, packages, rootDir, branch: process.env.BRANCH, tag: process.env.TAG, ghToken: process.env.GH_TOKEN, -}).catch((err) => { - console.info(err) - process.exit(1) }) diff --git a/tsconfig.json b/tsconfig.json index 15f1ef8884..3b527a9d10 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,8 +12,8 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, - "lib": ["DOM", "DOM.Iterable", "ES2020"], - "module": "ES2020", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "module": "ES2022", "moduleResolution": "Bundler", "noEmit": true, "noImplicitAny": true, From f62df97ae17cf0d87b82ac6fce888bbecd70209f Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 5 Jan 2024 21:46:54 +1100 Subject: [PATCH 2/2] Remove ts-expect-error --- packages/vue-query/src/__mocks__/useBaseQuery.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vue-query/src/__mocks__/useBaseQuery.ts b/packages/vue-query/src/__mocks__/useBaseQuery.ts index b67e7707cb..03a7c5e89b 100644 --- a/packages/vue-query/src/__mocks__/useBaseQuery.ts +++ b/packages/vue-query/src/__mocks__/useBaseQuery.ts @@ -2,7 +2,6 @@ import { vi } from 'vitest' import type { Mock } from 'vitest' const { useBaseQuery: originImpl, unrefQueryArgs: originalParse } = - // @ts-expect-error - vitest uses esmodules; tsconfig is not set to use them (await vi.importActual('../useBaseQuery')) as any export const useBaseQuery: Mock, any> = vi.fn(originImpl)