From 6a04243df36d0790639a78faea3432cc70814d02 Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Fri, 5 Sep 2025 17:11:00 +0200 Subject: [PATCH 1/2] Fix issues with SSR that stops start from building --- .gitignore | 1 + examples/react/drizzle/package.json | 3 +- package.json | 4 +- packages/devtools/package.json | 32 ++- packages/devtools/src/core.tsx | 2 + packages/devtools/tsconfig.json | 3 +- packages/devtools/tsup.config.ts | 19 ++ packages/react-devtools/src/index.ts | 4 +- pnpm-lock.yaml | 278 +++++++++++++++++++++++++++ 9 files changed, 329 insertions(+), 17 deletions(-) create mode 100644 packages/devtools/tsup.config.ts diff --git a/.gitignore b/.gitignore index aa4249bdb..5a363dbf3 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ vite.config.js.timestamp-* vite.config.ts.timestamp-* .angular +.nitro \ No newline at end of file diff --git a/examples/react/drizzle/package.json b/examples/react/drizzle/package.json index fd93bd834..1be18c4c4 100644 --- a/examples/react/drizzle/package.json +++ b/examples/react/drizzle/package.json @@ -5,6 +5,7 @@ "type": "module", "scripts": { "dev": "drizzle-kit studio & vite dev", + "build": "vite build", "start": "vite start" }, "dependencies": { @@ -27,4 +28,4 @@ "vite": "^7.0.6", "vite-plugin-inspect": "11.3.2" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 56edf3e1b..6d13091b4 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "size-limit": [ { - "path": "packages/devtools/dist/esm/index.js", + "path": "packages/devtools/dist/index.js", "limit": "40 KB" }, { @@ -84,4 +84,4 @@ "@tanstack/solid-devtools": "workspace:*", "@tanstack/devtools-vite": "workspace:*" } -} +} \ No newline at end of file diff --git a/packages/devtools/package.json b/packages/devtools/package.json index 8d9f16d11..e0bc99cfa 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -18,16 +18,26 @@ "devtools" ], "type": "module", - "types": "dist/esm/index.d.ts", - "module": "dist/esm/index.js", + "types": "dist/index.d.ts", + "module": "dist/index.js", "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } + "node": { + "types": "./dist/index.d.ts", + "import": "./dist/server.js" }, - "./package.json": "./package.json" + "browser": { + "development": { + "types": "./dist/index.d.ts", + "import": "./dist/dev.js" + }, + "types": "./dist/index.d.ts", + "import": "./dist/index.js" + }, + "types": "./dist/index.d.ts", + "import": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + } }, "sideEffects": false, "engines": { @@ -45,7 +55,7 @@ "test:lib:dev": "pnpm test:lib --watch", "test:types": "tsc", "test:build": "publint --strict", - "build": "vite build" + "build": "tsup" }, "dependencies": { "@solid-primitives/keyboard": "^1.2.8", @@ -60,6 +70,8 @@ "solid-js": ">=1.9.7" }, "devDependencies": { + "tsup": "^8.5.0", + "tsup-preset-solid": "^2.2.0", "vite-plugin-solid": "^2.11.6" } -} +} \ No newline at end of file diff --git a/packages/devtools/src/core.tsx b/packages/devtools/src/core.tsx index d98c481eb..377d0093b 100644 --- a/packages/devtools/src/core.tsx +++ b/packages/devtools/src/core.tsx @@ -61,6 +61,8 @@ export class TanStackDevtoolsCore { } mount(el: T) { + // tsup-preset-solid statically replaces this variable during build, which eliminates this code from server bundle + if (import.meta.env.SSR) return if (this.#isMounted) { throw new Error('Devtools is already mounted') } diff --git a/packages/devtools/tsconfig.json b/packages/devtools/tsconfig.json index 7a8173443..a0048a82f 100644 --- a/packages/devtools/tsconfig.json +++ b/packages/devtools/tsconfig.json @@ -9,8 +9,7 @@ ], "compilerOptions": { "jsxImportSource": "solid-js", - "jsx": "preserve", - + "jsx": "preserve", "types": ["vite/client"] } } diff --git a/packages/devtools/tsup.config.ts b/packages/devtools/tsup.config.ts new file mode 100644 index 000000000..757b84740 --- /dev/null +++ b/packages/devtools/tsup.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from 'tsup' +import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid' + +const preset_options = { + entries: { + entry: 'src/index.ts', + dev_entry: true, + server_entry: true, + }, + cjs: false, + drop_console: true, +} + +export default defineConfig(() => { + const parsed_data = parsePresetOptions(preset_options) + const tsup_options = generateTsupOptions(parsed_data) + + return tsup_options +}) \ No newline at end of file diff --git a/packages/react-devtools/src/index.ts b/packages/react-devtools/src/index.ts index 3f95d65e3..1c1549d98 100644 --- a/packages/react-devtools/src/index.ts +++ b/packages/react-devtools/src/index.ts @@ -5,8 +5,8 @@ import * as Devtools from './devtools' export const TanStackDevtools: (typeof Devtools)['TanStackDevtools'] = process.env.NODE_ENV !== 'development' ? function () { - return null - } + return null + } : Devtools.TanStackDevtools export type { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e56b2e58c..23b760929 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -359,6 +359,8 @@ importers: specifier: ^4.2.4 version: 4.2.4 + examples/react/start/generated/prisma: {} + examples/react/time-travel: dependencies: '@tanstack/devtools-event-client': @@ -475,6 +477,12 @@ importers: specifier: ^1.9.7 version: 1.9.7 devDependencies: + tsup: + specifier: ^8.5.0 + version: 8.5.0(@microsoft/api-extractor@7.47.7(@types/node@22.15.2))(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(typescript@5.8.3)(yaml@2.8.0) + tsup-preset-solid: + specifier: ^2.2.0 + version: 2.2.0(esbuild@0.25.8)(solid-js@1.9.7)(tsup@8.5.0(@microsoft/api-extractor@7.47.7(@types/node@22.15.2))(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(typescript@5.8.3)(yaml@2.8.0)) vite-plugin-solid: specifier: ^2.11.6 version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.7)(vite@7.0.6(@types/node@22.15.2)(jiti@2.5.1)(lightningcss@1.30.1)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) @@ -3298,6 +3306,9 @@ packages: resolution: {integrity: sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w==} engines: {node: '>=14'} + any-promise@1.3.0: + resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} @@ -3453,6 +3464,12 @@ packages: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} + bundle-require@5.1.0: + resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + esbuild: '>=0.18' + bytes-iec@3.1.1: resolution: {integrity: sha512-fey6+4jDK7TFtFg/klGSvNKJctyU7n2aQdnM+CO0ruLPbqqMOM8Tio0Pc+deqUeVKX1tL5DQep1zQ7+37aTAsA==} engines: {node: '>= 0.8'} @@ -3633,6 +3650,10 @@ packages: commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} + commander@4.1.1: + resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} + engines: {node: '>= 6'} + comment-parser@1.4.1: resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==} engines: {node: '>= 12.0.0'} @@ -4196,6 +4217,12 @@ packages: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} + esbuild-plugin-solid@0.5.0: + resolution: {integrity: sha512-ITK6n+0ayGFeDVUZWNMxX+vLsasEN1ILrg4pISsNOQ+mq4ljlJJiuXotInd+HE0MzwTcA9wExT1yzDE2hsqPsg==} + peerDependencies: + esbuild: '>=0.12' + solid-js: '>= 1.0' + esbuild-register@3.6.0: resolution: {integrity: sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==} peerDependencies: @@ -4570,6 +4597,9 @@ packages: resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} engines: {node: '>=18'} + fix-dts-default-cjs-exports@1.0.1: + resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==} + flat-cache@4.0.1: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} @@ -5058,6 +5088,10 @@ packages: jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} + joycon@3.1.1: + resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} + engines: {node: '>=10'} + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -5237,6 +5271,9 @@ packages: resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} engines: {node: '>=14'} + lines-and-columns@1.2.4: + resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + lines-and-columns@2.0.3: resolution: {integrity: sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -5248,6 +5285,10 @@ packages: resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} hasBin: true + load-tsconfig@0.2.5: + resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + local-pkg@0.5.1: resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==} engines: {node: '>=14'} @@ -5286,6 +5327,9 @@ packages: lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + lodash.sortby@4.7.0: + resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} + lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} @@ -5494,6 +5538,9 @@ packages: muggle-string@0.4.1: resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} + mz@2.7.0: + resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + nanoid@3.3.11: resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -5622,6 +5669,10 @@ packages: engines: {node: ^14.16.0 || >=16.10.0} hasBin: true + object-assign@4.1.1: + resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} + engines: {node: '>=0.10.0'} + object-inspect@1.13.4: resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} engines: {node: '>= 0.4'} @@ -5875,6 +5926,10 @@ packages: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} + pirates@4.0.7: + resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} + engines: {node: '>= 6'} + pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} @@ -5884,6 +5939,24 @@ packages: pnpm-workspace-yaml@1.1.0: resolution: {integrity: sha512-OWUzBxtitpyUV0fBYYwLAfWxn3mSzVbVB7cwgNaHvTTU9P0V2QHjyaY5i7f1hEiT9VeKsNH1Skfhe2E3lx/zhA==} + postcss-load-config@6.0.1: + resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} + engines: {node: '>= 18'} + peerDependencies: + jiti: '>=1.21.0' + postcss: '>=8.0.9' + tsx: ^4.8.1 + yaml: ^2.4.2 + peerDependenciesMeta: + jiti: + optional: true + postcss: + optional: true + tsx: + optional: true + yaml: + optional: true + postcss-values-parser@6.0.2: resolution: {integrity: sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==} engines: {node: '>=10'} @@ -6398,6 +6471,11 @@ packages: resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} engines: {node: '>= 12'} + source-map@0.8.0-beta.0: + resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} + engines: {node: '>= 8'} + deprecated: The work that was done in this beta branch won't be included in future versions + space-separated-tokens@2.0.2: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} @@ -6512,6 +6590,11 @@ packages: strip-literal@3.0.0: resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==} + sucrase@3.35.0: + resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + supports-color@10.0.0: resolution: {integrity: sha512-HRVVSbCCMbj7/kdWF9Q+bbckjBHLtHMEoJWlkmYzzdwhYMkjkOwubLM6t7NbWKjgKamGDrWL1++KrjUO1t9oAQ==} engines: {node: '>=18'} @@ -6582,6 +6665,13 @@ packages: text-hex@1.0.0: resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} + thenify-all@1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + + thenify@3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} @@ -6660,10 +6750,17 @@ packages: tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + tr46@1.0.1: + resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + tr46@5.1.1: resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==} engines: {node: '>=18'} + tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} @@ -6682,6 +6779,9 @@ packages: peerDependencies: typescript: '>=4.0.0' + ts-interface-checker@0.1.13: + resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + ts-pattern@5.7.0: resolution: {integrity: sha512-0/FvIG4g3kNkYgbNwBBW5pZBkfpeYQnH+2AA3xmjkCAit/DSDPKmgwC3fKof4oYUq6gupClVOJlFl+939VRBMg==} @@ -6702,6 +6802,30 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tsup-preset-solid@2.2.0: + resolution: {integrity: sha512-sPAzeArmYkVAZNRN+m4tkiojdd0GzW/lCwd4+TQDKMENe8wr2uAuro1s0Z59ASmdBbkXoxLgCiNcuQMyiidMZg==} + peerDependencies: + tsup: ^8.0.0 + + tsup@8.5.0: + resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + '@microsoft/api-extractor': ^7.36.0 + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.5.0' + peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + tsx@4.20.3: resolution: {integrity: sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==} engines: {node: '>=18.0.0'} @@ -7165,6 +7289,9 @@ packages: webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + webidl-conversions@4.0.2: + resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + webidl-conversions@7.0.0: resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} engines: {node: '>=12'} @@ -7191,6 +7318,9 @@ packages: whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + whatwg-url@7.1.0: + resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -7671,6 +7801,11 @@ snapshots: '@babel/core': 7.28.0 '@babel/helper-plugin-utils': 7.27.1 + '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.28.3)': + dependencies: + '@babel/core': 7.28.3 + '@babel/helper-plugin-utils': 7.27.1 + '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.0)': dependencies: '@babel/core': 7.28.0 @@ -10708,6 +10843,8 @@ snapshots: ansis@4.1.0: {} + any-promise@1.3.0: {} + anymatch@3.1.3: dependencies: normalize-path: 3.0.0 @@ -10796,11 +10933,26 @@ snapshots: parse5: 7.3.0 validate-html-nesting: 1.2.2 + babel-plugin-jsx-dom-expressions@0.39.7(@babel/core@7.28.3): + dependencies: + '@babel/core': 7.28.3 + '@babel/helper-module-imports': 7.18.6 + '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.28.3) + '@babel/types': 7.28.2 + html-entities: 2.3.3 + parse5: 7.3.0 + validate-html-nesting: 1.2.2 + babel-preset-solid@1.9.5(@babel/core@7.28.0): dependencies: '@babel/core': 7.28.0 babel-plugin-jsx-dom-expressions: 0.39.7(@babel/core@7.28.0) + babel-preset-solid@1.9.5(@babel/core@7.28.3): + dependencies: + '@babel/core': 7.28.3 + babel-plugin-jsx-dom-expressions: 0.39.7(@babel/core@7.28.3) + balanced-match@1.0.2: {} bare-events@2.6.0: @@ -10883,6 +11035,11 @@ snapshots: dependencies: run-applescript: 7.0.0 + bundle-require@5.1.0(esbuild@0.25.8): + dependencies: + esbuild: 0.25.8 + load-tsconfig: 0.2.5 + bytes-iec@3.1.1: {} c12@3.1.0(magicast@0.3.5): @@ -11083,6 +11240,8 @@ snapshots: commander@2.20.3: {} + commander@4.1.1: {} + comment-parser@1.4.1: {} common-path-prefix@3.0.0: {} @@ -11486,6 +11645,16 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 + esbuild-plugin-solid@0.5.0(esbuild@0.25.8)(solid-js@1.9.7): + dependencies: + '@babel/core': 7.28.3 + '@babel/preset-typescript': 7.27.1(@babel/core@7.28.3) + babel-preset-solid: 1.9.5(@babel/core@7.28.3) + esbuild: 0.25.8 + solid-js: 1.9.7 + transitivePeerDependencies: + - supports-color + esbuild-register@3.6.0(esbuild@0.25.8): dependencies: debug: 4.4.1 @@ -12052,6 +12221,12 @@ snapshots: path-exists: 5.0.0 unicorn-magic: 0.1.0 + fix-dts-default-cjs-exports@1.0.1: + dependencies: + magic-string: 0.30.17 + mlly: 1.7.4 + rollup: 4.46.2 + flat-cache@4.0.1: dependencies: flatted: 3.3.3 @@ -12541,6 +12716,8 @@ snapshots: jju@1.4.0: {} + joycon@3.1.1: {} + js-tokens@4.0.0: {} js-tokens@9.0.1: {} @@ -12713,6 +12890,8 @@ snapshots: lilconfig@3.1.3: {} + lines-and-columns@1.2.4: {} + lines-and-columns@2.0.3: {} linkify-it@5.0.0: @@ -12740,6 +12919,8 @@ snapshots: untun: 0.1.3 uqr: 0.1.2 + load-tsconfig@0.2.5: {} + local-pkg@0.5.1: dependencies: mlly: 1.7.4 @@ -12775,6 +12956,8 @@ snapshots: lodash.merge@4.6.2: {} + lodash.sortby@4.7.0: {} + lodash.startcase@4.4.0: {} lodash@4.17.21: {} @@ -12970,6 +13153,12 @@ snapshots: muggle-string@0.4.1: {} + mz@2.7.0: + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + nanoid@3.3.11: {} nanoid@5.1.5: {} @@ -13309,6 +13498,8 @@ snapshots: pkg-types: 2.2.0 tinyexec: 1.0.1 + object-assign@4.1.1: {} + object-inspect@1.13.4: {} ofetch@1.4.1: @@ -13543,6 +13734,8 @@ snapshots: pify@4.0.1: {} + pirates@4.0.7: {} + pkg-types@1.3.1: dependencies: confbox: 0.1.8 @@ -13559,6 +13752,15 @@ snapshots: dependencies: yaml: 2.8.0 + postcss-load-config@6.0.1(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(yaml@2.8.0): + dependencies: + lilconfig: 3.1.3 + optionalDependencies: + jiti: 2.5.1 + postcss: 8.5.6 + tsx: 4.20.3 + yaml: 2.8.0 + postcss-values-parser@6.0.2(postcss@8.5.6): dependencies: color-name: 1.1.4 @@ -14119,6 +14321,10 @@ snapshots: source-map@0.7.6: {} + source-map@0.8.0-beta.0: + dependencies: + whatwg-url: 7.1.0 + space-separated-tokens@2.0.2: {} spawndamnit@3.0.1: @@ -14226,6 +14432,16 @@ snapshots: dependencies: js-tokens: 9.0.1 + sucrase@3.35.0: + dependencies: + '@jridgewell/gen-mapping': 0.3.12 + commander: 4.1.1 + glob: 10.4.5 + lines-and-columns: 1.2.4 + mz: 2.7.0 + pirates: 4.0.7 + ts-interface-checker: 0.1.13 + supports-color@10.0.0: {} supports-color@7.2.0: @@ -14308,6 +14524,14 @@ snapshots: text-hex@1.0.0: {} + thenify-all@1.6.0: + dependencies: + thenify: 3.3.1 + + thenify@3.3.1: + dependencies: + any-promise: 1.3.0 + through@2.3.8: {} tiny-invariant@1.3.3: {} @@ -14368,10 +14592,16 @@ snapshots: tr46@0.0.3: {} + tr46@1.0.1: + dependencies: + punycode: 2.3.1 + tr46@5.1.1: dependencies: punycode: 2.3.1 + tree-kill@1.2.2: {} + trim-lines@3.0.1: {} triple-beam@1.4.1: {} @@ -14385,6 +14615,8 @@ snapshots: picomatch: 4.0.3 typescript: 5.8.3 + ts-interface-checker@0.1.13: {} + ts-pattern@5.7.0: {} tsconfck@3.1.5(typescript@5.8.3): @@ -14399,6 +14631,44 @@ snapshots: tslib@2.8.1: {} + tsup-preset-solid@2.2.0(esbuild@0.25.8)(solid-js@1.9.7)(tsup@8.5.0(@microsoft/api-extractor@7.47.7(@types/node@22.15.2))(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(typescript@5.8.3)(yaml@2.8.0)): + dependencies: + esbuild-plugin-solid: 0.5.0(esbuild@0.25.8)(solid-js@1.9.7) + tsup: 8.5.0(@microsoft/api-extractor@7.47.7(@types/node@22.15.2))(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(typescript@5.8.3)(yaml@2.8.0) + transitivePeerDependencies: + - esbuild + - solid-js + - supports-color + + tsup@8.5.0(@microsoft/api-extractor@7.47.7(@types/node@22.15.2))(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(typescript@5.8.3)(yaml@2.8.0): + dependencies: + bundle-require: 5.1.0(esbuild@0.25.8) + cac: 6.7.14 + chokidar: 4.0.3 + consola: 3.4.2 + debug: 4.4.1 + esbuild: 0.25.8 + fix-dts-default-cjs-exports: 1.0.1 + joycon: 3.1.1 + picocolors: 1.1.1 + postcss-load-config: 6.0.1(jiti@2.5.1)(postcss@8.5.6)(tsx@4.20.3)(yaml@2.8.0) + resolve-from: 5.0.0 + rollup: 4.46.2 + source-map: 0.8.0-beta.0 + sucrase: 3.35.0 + tinyexec: 0.3.2 + tinyglobby: 0.2.14 + tree-kill: 1.2.2 + optionalDependencies: + '@microsoft/api-extractor': 7.47.7(@types/node@22.15.2) + postcss: 8.5.6 + typescript: 5.8.3 + transitivePeerDependencies: + - jiti + - supports-color + - tsx + - yaml + tsx@4.20.3: dependencies: esbuild: 0.25.3 @@ -14960,6 +15230,8 @@ snapshots: webidl-conversions@3.0.1: {} + webidl-conversions@4.0.2: {} + webidl-conversions@7.0.0: {} webpack-virtual-modules@0.6.2: {} @@ -14982,6 +15254,12 @@ snapshots: tr46: 0.0.3 webidl-conversions: 3.0.1 + whatwg-url@7.1.0: + dependencies: + lodash.sortby: 4.7.0 + tr46: 1.0.1 + webidl-conversions: 4.0.2 + which@2.0.2: dependencies: isexe: 2.0.0 From b694760b3cf89a783847c6e4e3a00a14e75d372a Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 15:12:06 +0000 Subject: [PATCH 2/2] ci: apply automated fixes --- examples/react/drizzle/package.json | 2 +- package.json | 2 +- packages/devtools/package.json | 2 +- packages/devtools/tsconfig.json | 2 +- packages/devtools/tsup.config.ts | 2 +- packages/react-devtools/src/index.ts | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/react/drizzle/package.json b/examples/react/drizzle/package.json index 1be18c4c4..e152fc7d4 100644 --- a/examples/react/drizzle/package.json +++ b/examples/react/drizzle/package.json @@ -28,4 +28,4 @@ "vite": "^7.0.6", "vite-plugin-inspect": "11.3.2" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 6d13091b4..0c1ee0d55 100644 --- a/package.json +++ b/package.json @@ -84,4 +84,4 @@ "@tanstack/solid-devtools": "workspace:*", "@tanstack/devtools-vite": "workspace:*" } -} \ No newline at end of file +} diff --git a/packages/devtools/package.json b/packages/devtools/package.json index e0bc99cfa..4600d01ae 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -74,4 +74,4 @@ "tsup-preset-solid": "^2.2.0", "vite-plugin-solid": "^2.11.6" } -} \ No newline at end of file +} diff --git a/packages/devtools/tsconfig.json b/packages/devtools/tsconfig.json index a0048a82f..ae3ba081e 100644 --- a/packages/devtools/tsconfig.json +++ b/packages/devtools/tsconfig.json @@ -9,7 +9,7 @@ ], "compilerOptions": { "jsxImportSource": "solid-js", - "jsx": "preserve", + "jsx": "preserve", "types": ["vite/client"] } } diff --git a/packages/devtools/tsup.config.ts b/packages/devtools/tsup.config.ts index 757b84740..0cff260d3 100644 --- a/packages/devtools/tsup.config.ts +++ b/packages/devtools/tsup.config.ts @@ -16,4 +16,4 @@ export default defineConfig(() => { const tsup_options = generateTsupOptions(parsed_data) return tsup_options -}) \ No newline at end of file +}) diff --git a/packages/react-devtools/src/index.ts b/packages/react-devtools/src/index.ts index 1c1549d98..3f95d65e3 100644 --- a/packages/react-devtools/src/index.ts +++ b/packages/react-devtools/src/index.ts @@ -5,8 +5,8 @@ import * as Devtools from './devtools' export const TanStackDevtools: (typeof Devtools)['TanStackDevtools'] = process.env.NODE_ENV !== 'development' ? function () { - return null - } + return null + } : Devtools.TanStackDevtools export type {