From ea23132e81e1b1c2d10b968703de30ab463a43b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:18:01 +0000 Subject: [PATCH 1/3] Update dependency typescript to v5.5.3 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a95cdbaa..242ebf5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,7 +75,7 @@ "smoldash": "0.11.0", "svelte": "3.59.1", "svelte-preprocess": "5.0.4", - "typescript": "5.1.6", + "typescript": "5.5.3", "vue": "3.3.4" }, "engines": { @@ -16860,10 +16860,11 @@ "dev": true }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index c23ba87e..121b8937 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "smoldash": "0.11.0", "svelte": "3.59.1", "svelte-preprocess": "5.0.4", - "typescript": "5.1.6", + "typescript": "5.5.3", "vue": "3.3.4" }, "dependencies": { From 472d21b55930c977b950d64ff3e1659ceb168e53 Mon Sep 17 00:00:00 2001 From: Caleb Eby Date: Thu, 25 Jul 2024 08:38:40 -0700 Subject: [PATCH 2/3] ESLint fix --- src/extend-expect.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extend-expect.ts b/src/extend-expect.ts index c96ac92a..683608d9 100644 --- a/src/extend-expect.ts +++ b/src/extend-expect.ts @@ -225,7 +225,7 @@ const runJestUtilsInNode = (message: string, context: jest.MatcherContext) => { const closeRegex = /\$END_JEST_UTILS\$/g; let jestUtilsCall; while ((jestUtilsCall = jestUtilsCalls.pop())) { - const start = jestUtilsCall.index!; + const start = jestUtilsCall.index; const methodName = jestUtilsCall[1]; closeRegex.lastIndex = start; const closeIndex = closeRegex.exec(message)?.index; From 019d6aa4050dc4670a0e92b88e1652e533ee3638 Mon Sep 17 00:00:00 2001 From: Caleb Eby Date: Thu, 25 Jul 2024 08:46:12 -0700 Subject: [PATCH 3/3] Make TS happy with sveltePreprocess options --- tests/utils/runJS.test.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/utils/runJS.test.tsx b/tests/utils/runJS.test.tsx index cd5bc5bc..32a3951c 100644 --- a/tests/utils/runJS.test.tsx +++ b/tests/utils/runJS.test.tsx @@ -494,8 +494,12 @@ describe('Ecosystem interoperability', () => { plugins: [ sveltePlugin({ preprocess: sveltePreprocess({ - // Does not work with module set to nodenext, works with either commonjs or esnext - typescript: { compilerOptions: { module: 'commonjs' } }, + typescript: { + compilerOptions: { + module: 'preserve', + moduleResolution: 'bundler', + }, + }, }), }), ],