From 4e001c893c6f47d68bf1afd28486d22b344f4e23 Mon Sep 17 00:00:00 2001 From: Aarti Sonigra <23amtics292@gmail.com> Date: Sat, 9 May 2026 12:27:20 +0530 Subject: [PATCH 1/2] fix(start-plugin-core): handle dropped plugin driver during resolve --- package.json | 5 ++- .../src/vite/start-compiler-plugin/plugin.ts | 35 ++++++++++----- pnpm-lock.yaml | 44 ++++++++++++++++++- 3 files changed, 70 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 89a0dcf333..18ca26f5e8 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "@tanstack/query-core": "^5.99.0", "@tanstack/react-query": "^5.99.0", "@tanstack/solid-query": "^5.99.0", - "@tanstack/vue-query": "^5.99.0", "@tanstack/vite-config": "0.5.2", + "@tanstack/vue-query": "^5.99.0", "@types/node": "25.0.9", "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", @@ -143,5 +143,8 @@ "@tanstack/start-static-server-functions": "workspace:*", "@tanstack/nitro-v2-vite-plugin": "workspace:*" } + }, + "dependencies": { + "@tanstack/react-start": "1.167.57" } } diff --git a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts index 3130ca47c1..88553e6b6a 100644 --- a/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts +++ b/packages/start-plugin-core/src/vite/start-compiler-plugin/plugin.ts @@ -28,7 +28,12 @@ import type { GenerateFunctionIdFnOptional, ServerFn, } from '../../start-compiler/types' -import type { EnvironmentModuleNode, PluginOption } from 'vite' +import type { + DevEnvironment, + EnvironmentModuleNode, + HotUpdateOptions, + PluginOption, +} from 'vite' // Re-export from shared constants for backwards compatibility export { SERVER_FN_LOOKUP } @@ -276,20 +281,27 @@ export function startCompilerPlugin( ) } - await this.environment.transformRequest( + await (this.environment as DevEnvironment).transformRequest( `${id}?${SERVER_FN_LOOKUP}`, ) }, - resolveId: async (source: string, importer?: string) => { - const r = await this.resolve(source, importer) - - if (r) { - if (!r.external) { - return cleanId(r.id) + try { + const r = await this.resolve(source, importer) + if (r) { + if (!r.external) { + return cleanId(r.id) + } } + } catch (err) { + if ( + err instanceof Error && + err.message.includes('Plugin driver is already dropped') + ) { + return null + } + throw err } - return null }, }) @@ -311,7 +323,7 @@ export function startCompilerPlugin( }, }, - hotUpdate(ctx) { + hotUpdate(ctx: HotUpdateOptions) { const compiler = compilers.get(this.environment.name) const idsToInvalidate = new Set() const transitiveCompilerImportersToInvalidate = new Set() @@ -462,7 +474,7 @@ export function startCompilerPlugin( ) } - await this.environment.transformRequest( + await (this.environment as DevEnvironment).transformRequest( `${absPath}?${SERVER_FN_LOOKUP}`, ) @@ -501,6 +513,7 @@ export function startCompilerPlugin( this.error( `No getServerFnById implementation found for caller environment: ${this.environment.name}`, ) + return } if (this.environment.mode !== 'build') { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc1dbdc4cd..b2367144f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,6 +63,10 @@ overrides: importers: .: + dependencies: + '@tanstack/react-start': + specifier: 1.167.57 + version: 1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) devDependencies: '@arethetypeswrong/cli': specifier: ^0.18.2 @@ -11449,7 +11453,7 @@ importers: devDependencies: '@netlify/vite-plugin-tanstack-start': specifier: ^1.1.4 - version: 1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) + version: 1.1.4(@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)))(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) @@ -18885,6 +18889,24 @@ packages: peerDependencies: react: ^19.2.3 + '@tanstack/react-start@1.167.57': + resolution: {integrity: sha512-cF4tV7bsmbG6naT2W+Jl26J+wuFRdWiqzRJJnbblrhAlwCIrXWEKPuKmQg5aVWTI8QzgEIkctEit/IRx3Uzc/w==} + engines: {node: '>=22.12.0'} + hasBin: true + peerDependencies: + '@rsbuild/core': ^2.0.0 + '@vitejs/plugin-rsc': '*' + react: ^19.2.3 + react-dom: ^19.2.3 + vite: ^8.0.0 + peerDependenciesMeta: + '@rsbuild/core': + optional: true + '@vitejs/plugin-rsc': + optional: true + vite: + optional: true + '@tanstack/react-store@0.9.3': resolution: {integrity: sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg==} peerDependencies: @@ -29589,11 +29611,12 @@ snapshots: '@netlify/types@2.1.0': {} - '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': + '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)))(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': dependencies: '@netlify/vite-plugin': 2.7.4(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1) optionalDependencies: + '@tanstack/react-start': 1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) '@tanstack/solid-start': link:packages/solid-start transitivePeerDependencies: - '@azure/app-configuration' @@ -32233,6 +32256,23 @@ snapshots: '@tanstack/query-core': 5.99.0 react: 19.2.3 + '@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': + dependencies: + '@tanstack/react-router': link:packages/react-router + '@tanstack/react-start-client': link:packages/react-start-client + '@tanstack/react-start-rsc': link:packages/react-start-rsc + '@tanstack/react-start-server': link:packages/react-start-server + '@tanstack/router-utils': link:packages/router-utils + '@tanstack/start-client-core': link:packages/start-client-core + '@tanstack/start-plugin-core': link:packages/start-plugin-core + '@tanstack/start-server-core': link:packages/start-server-core + pathe: 2.0.3 + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) + optionalDependencies: + '@rsbuild/core': 2.0.1(core-js@3.40.0) + vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1) + '@tanstack/react-store@0.9.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/store': 0.9.3 From 7a1667a01a513073858b38b09ae417c6a22ef95f Mon Sep 17 00:00:00 2001 From: Aarti Sonigra <23amtics292@gmail.com> Date: Sat, 9 May 2026 13:19:49 +0530 Subject: [PATCH 2/2] chore: sync pnpm lockfile --- pnpm-lock.yaml | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2367144f5..ffb13d6fe1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,8 +65,8 @@ importers: .: dependencies: '@tanstack/react-start': - specifier: 1.167.57 - version: 1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) + specifier: workspace:* + version: link:packages/react-start devDependencies: '@arethetypeswrong/cli': specifier: ^0.18.2 @@ -11453,7 +11453,7 @@ importers: devDependencies: '@netlify/vite-plugin-tanstack-start': specifier: ^1.1.4 - version: 1.1.4(@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)))(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) + version: 1.1.4(@tanstack/react-start@packages+react-start)(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) '@tailwindcss/vite': specifier: ^4.2.2 version: 4.2.2(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) @@ -18889,24 +18889,6 @@ packages: peerDependencies: react: ^19.2.3 - '@tanstack/react-start@1.167.57': - resolution: {integrity: sha512-cF4tV7bsmbG6naT2W+Jl26J+wuFRdWiqzRJJnbblrhAlwCIrXWEKPuKmQg5aVWTI8QzgEIkctEit/IRx3Uzc/w==} - engines: {node: '>=22.12.0'} - hasBin: true - peerDependencies: - '@rsbuild/core': ^2.0.0 - '@vitejs/plugin-rsc': '*' - react: ^19.2.3 - react-dom: ^19.2.3 - vite: ^8.0.0 - peerDependenciesMeta: - '@rsbuild/core': - optional: true - '@vitejs/plugin-rsc': - optional: true - vite: - optional: true - '@tanstack/react-store@0.9.3': resolution: {integrity: sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg==} peerDependencies: @@ -29611,12 +29593,12 @@ snapshots: '@netlify/types@2.1.0': {} - '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)))(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': + '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/react-start@packages+react-start)(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': dependencies: '@netlify/vite-plugin': 2.7.4(babel-plugin-macros@3.1.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(encoding@0.1.13)(ioredis@5.9.2)(rollup@4.56.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1) optionalDependencies: - '@tanstack/react-start': 1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) + '@tanstack/react-start': link:packages/react-start '@tanstack/solid-start': link:packages/solid-start transitivePeerDependencies: - '@azure/app-configuration' @@ -32256,23 +32238,6 @@ snapshots: '@tanstack/query-core': 5.99.0 react: 19.2.3 - '@tanstack/react-start@1.167.57(@rsbuild/core@2.0.1(core-js@3.40.0))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1))': - dependencies: - '@tanstack/react-router': link:packages/react-router - '@tanstack/react-start-client': link:packages/react-start-client - '@tanstack/react-start-rsc': link:packages/react-start-rsc - '@tanstack/react-start-server': link:packages/react-start-server - '@tanstack/router-utils': link:packages/router-utils - '@tanstack/start-client-core': link:packages/start-client-core - '@tanstack/start-plugin-core': link:packages/start-plugin-core - '@tanstack/start-server-core': link:packages/start-server-core - pathe: 2.0.3 - react: 19.2.3 - react-dom: 19.2.3(react@19.2.3) - optionalDependencies: - '@rsbuild/core': 2.0.1(core-js@3.40.0) - vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1) - '@tanstack/react-store@0.9.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/store': 0.9.3 @@ -33498,7 +33463,7 @@ snapshots: sirv: 3.0.2 tinyglobby: 0.2.15 tinyrainbow: 3.1.0 - vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1)(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) + vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(postcss@8.5.8))(msw@2.7.0(@types/node@25.0.9)(typescript@6.0.2))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.21.0)(yaml@2.8.1)) '@vitest/utils@4.1.4': dependencies: