diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index c865716360..4e3dcf7a02 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -53,10 +53,10 @@ "@solid-primitives/storage": "^1.3.11", "@tanstack/match-sorter-utils": "^8.8.4", "@tanstack/query-core": "workspace:*", - "solid-js": "^1.6.13", + "solid-js": "^1.7.8", "solid-transition-group": "^0.2.2", "superjson": "^1.12.4", - "tsup-preset-solid": "^0.1.8", + "tsup-preset-solid": "^2.0.1", "vite-plugin-solid": "^2.5.0" } } diff --git a/packages/query-devtools/tsup.config.js b/packages/query-devtools/tsup.config.js index 366fff57cf..4ac1e1f573 100644 --- a/packages/query-devtools/tsup.config.js +++ b/packages/query-devtools/tsup.config.js @@ -1,18 +1,32 @@ // @ts-check -import { defineConfig } from 'tsup-preset-solid' +import { defineConfig } from 'tsup' +import * as preset from 'tsup-preset-solid' -export default defineConfig( - { - entry: 'src/index.tsx', - devEntry: true, - }, - { - dropConsole: true, - cjs: true, - tsupOptions: (config) => ({ - ...config, - outDir: 'build', - }), - }, -) +const preset_options = { + // array or single object + entries: [ + // default entry (index) + { + // entries with '.tsx' extension will have `solid` export condition generated + entry: 'src/index.tsx', + // will generate a separate development entry + dev_entry: true, + }, + ], + // Set to `true` to remove all `console.*` calls and `debugger` statements in prod builds + drop_console: true, + // Set to `true` to generate a CommonJS build alongside ESM + cjs: true, +} + +export default defineConfig(() => { + const parsed_options = preset.parsePresetOptions(preset_options) + const tsup_options = preset.generateTsupOptions(parsed_options) + + tsup_options.forEach((tsup_option) => { + tsup_option.outDir = 'build' + }) + + return tsup_options +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ca3621162c..35eacf06f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1485,13 +1485,13 @@ importers: version: 11.11.0 '@solid-primitives/keyed': specifier: ^1.2.0 - version: 1.2.0(solid-js@1.6.13) + version: 1.2.0(solid-js@1.7.8) '@solid-primitives/resize-observer': specifier: ^2.0.18 - version: 2.0.18(solid-js@1.6.13) + version: 2.0.18(solid-js@1.7.8) '@solid-primitives/storage': specifier: ^1.3.11 - version: 1.3.11(solid-js@1.6.13) + version: 1.3.11(solid-js@1.7.8) '@tanstack/match-sorter-utils': specifier: ^8.8.4 version: 8.8.4 @@ -1499,20 +1499,20 @@ importers: specifier: workspace:* version: link:../query-core solid-js: - specifier: ^1.6.13 - version: 1.6.13 + specifier: ^1.7.8 + version: 1.7.8 solid-transition-group: specifier: ^0.2.2 - version: 0.2.2(solid-js@1.6.13) + version: 0.2.2(solid-js@1.7.8) superjson: specifier: ^1.12.4 version: 1.12.4 tsup-preset-solid: - specifier: ^0.1.8 - version: 0.1.8(esbuild@0.18.13)(solid-js@1.6.13)(tsup@6.7.0) + specifier: ^2.0.1 + version: 2.0.1(esbuild@0.18.13)(solid-js@1.7.8)(tsup@7.1.0) vite-plugin-solid: specifier: ^2.5.0 - version: 2.5.0(solid-js@1.6.13)(vite@4.4.4) + version: 2.5.0(solid-js@1.7.8)(vite@4.4.4) packages/query-persist-client-core: dependencies: @@ -7685,85 +7685,85 @@ packages: '@sinonjs/commons': 1.8.6 dev: false - /@solid-primitives/event-listener@2.2.13(solid-js@1.6.13): + /@solid-primitives/event-listener@2.2.13(solid-js@1.7.8): resolution: {integrity: sha512-8GtVEq0ECZoa5Klo1jjfGPfwg0zVJ8TNnNkWu8FqRkh0CkhbhCVJAKwjleem9K/qL6zUDfJihLjhqGBTBbb+8w==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/keyed@1.2.0(solid-js@1.6.13): + /@solid-primitives/keyed@1.2.0(solid-js@1.7.8): resolution: {integrity: sha512-0DuTeJdxWjCTu73XnDZs24JzfXckBnpvCfQ6Mf/kTPKkMZJh7tjkBnZEk48ckrE9xmwat9stIdfrBmZctsepIw==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.6.13 + solid-js: 1.7.8 dev: true - /@solid-primitives/refs@1.0.4(solid-js@1.6.13): + /@solid-primitives/refs@1.0.4(solid-js@1.7.8): resolution: {integrity: sha512-BxZKkct0OIyADWIoA9UITm+3G5Xb3IkOa0nZd40SgOK5DtMqpXFIEPUkJ/woPB90WqlM9UvvuiJHUyAjMeAmCw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/resize-observer@2.0.18(solid-js@1.6.13): + /@solid-primitives/resize-observer@2.0.18(solid-js@1.7.8): resolution: {integrity: sha512-k4jTqa2hQc1HBLGUUSy69ziVJF2xlBzglUp2Saeor7RrZiWudODGyoUMdNAY+PN3iH4zyH4eEa/Fs+9kIrREig==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/event-listener': 2.2.13(solid-js@1.6.13) - '@solid-primitives/rootless': 1.4.1(solid-js@1.6.13) - '@solid-primitives/static-store': 0.0.4(solid-js@1.6.13) - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/event-listener': 2.2.13(solid-js@1.7.8) + '@solid-primitives/rootless': 1.4.1(solid-js@1.7.8) + '@solid-primitives/static-store': 0.0.4(solid-js@1.7.8) + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/rootless@1.4.1(solid-js@1.6.13): + /@solid-primitives/rootless@1.4.1(solid-js@1.7.8): resolution: {integrity: sha512-h7VBUk8usD76Eh1a4wT17PcGtIRxGPlLuJ4Mf7roCNu46W5cc9DAoz8M6XebuZWVKeUkML/JuPMZQSV0mLo2Fw==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/static-store@0.0.4(solid-js@1.6.13): + /@solid-primitives/static-store@0.0.4(solid-js@1.7.8): resolution: {integrity: sha512-NcLtDNA6H+Z9LmqaUe4SKfMx0YbszIMXEqfV15cB34t5XyEeOM5TihYwsVJ/dpkmpHYzflm0SwAL+P9uwyzvWQ==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/storage@1.3.11(solid-js@1.6.13): + /@solid-primitives/storage@1.3.11(solid-js@1.7.8): resolution: {integrity: sha512-PpQWR3TaTxHIJFbI9ZssYTM4Aa67g1vJIgps4TPhcXzHqqomrPAIveFC2FG7SDQoi9YQia8FVBjigELziJpfIg==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/utils': 6.2.0(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/utils': 6.2.0(solid-js@1.7.8) + solid-js: 1.7.8 dev: true - /@solid-primitives/transition-group@1.0.2(solid-js@1.6.13): + /@solid-primitives/transition-group@1.0.2(solid-js@1.7.8): resolution: {integrity: sha512-+o3J7TnU0/Sok+LKA0z0wvhim88dpd2eFBk8/05adE6wVypVlME8sKqTMO+xRv8HoT4Kq3sczmvwV07FKg2n+g==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.6.13 + solid-js: 1.7.8 dev: true - /@solid-primitives/utils@6.2.0(solid-js@1.6.13): + /@solid-primitives/utils@6.2.0(solid-js@1.7.8): resolution: {integrity: sha512-T62WlLwKkbmicsw/xpwMQyv9MmZRSaVyutXfS5icc9v0cb8qGMUxRxr5LVvZHYQCZ9DEFboZB0r711xsbVBbeA==} peerDependencies: solid-js: ^1.6.12 dependencies: - solid-js: 1.6.13 + solid-js: 1.7.8 dev: true /@solidjs/meta@0.28.2(solid-js@1.6.13): @@ -13656,6 +13656,21 @@ packages: - supports-color dev: true + /esbuild-plugin-solid@0.5.0(esbuild@0.18.13)(solid-js@1.7.8): + resolution: {integrity: sha512-ITK6n+0ayGFeDVUZWNMxX+vLsasEN1ILrg4pISsNOQ+mq4ljlJJiuXotInd+HE0MzwTcA9wExT1yzDE2hsqPsg==} + peerDependencies: + esbuild: '>=0.12' + solid-js: '>= 1.0' + dependencies: + '@babel/core': 7.22.9 + '@babel/preset-typescript': 7.21.5(@babel/core@7.22.9) + babel-preset-solid: 1.7.7(@babel/core@7.22.9) + esbuild: 0.18.13 + solid-js: 1.7.8 + transitivePeerDependencies: + - supports-color + dev: true + /esbuild-sunos-64@0.14.54: resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} @@ -25032,6 +25047,11 @@ packages: randombytes: 2.1.0 dev: false + /seroval@0.5.1: + resolution: {integrity: sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g==} + engines: {node: '>=10'} + dev: true + /serve-index@1.9.1(supports-color@6.1.0): resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} engines: {node: '>= 0.8.0'} @@ -25287,6 +25307,13 @@ packages: dependencies: csstype: 3.1.0 + /solid-js@1.7.8: + resolution: {integrity: sha512-XHBWk1FvFd0JMKljko7FfhefJMTSgYEuVKcQ2a8hzRXfiuSJAGsrPPafqEo+f6l+e8Oe3cROSpIL6kbzjC1fjQ==} + dependencies: + csstype: 3.1.2 + seroval: 0.5.1 + dev: true + /solid-refresh@0.4.1(solid-js@1.6.13): resolution: {integrity: sha512-v3tD/OXQcUyXLrWjPW1dXZyeWwP7/+GQNs8YTL09GBq+5FguA6IejJWUvJDrLIA4M0ho9/5zK2e9n+uy+4488g==} peerDependencies: @@ -25297,6 +25324,17 @@ packages: '@babel/types': 7.22.5 solid-js: 1.6.13 + /solid-refresh@0.4.1(solid-js@1.7.8): + resolution: {integrity: sha512-v3tD/OXQcUyXLrWjPW1dXZyeWwP7/+GQNs8YTL09GBq+5FguA6IejJWUvJDrLIA4M0ho9/5zK2e9n+uy+4488g==} + peerDependencies: + solid-js: ^1.3 + dependencies: + '@babel/generator': 7.22.9 + '@babel/helper-module-imports': 7.22.5 + '@babel/types': 7.22.5 + solid-js: 1.7.8 + dev: true + /solid-refresh@0.5.3(solid-js@1.6.13): resolution: {integrity: sha512-Otg5it5sjOdZbQZJnvo99TEBAr6J7PQ5AubZLNU6szZzg3RQQ5MX04oteBIIGDs0y2Qv8aXKm9e44V8z+UnFdw==} peerDependencies: @@ -25401,14 +25439,14 @@ packages: transitivePeerDependencies: - supports-color - /solid-transition-group@0.2.2(solid-js@1.6.13): + /solid-transition-group@0.2.2(solid-js@1.7.8): resolution: {integrity: sha512-6nB90UM2PB6VsIo/UCkmZmlIJb9mnmP7QPGrePqQJWtpUiRs5PbhkB8fvdyv9g/RPHWYpdJhQgxL6n++WmTt5A==} peerDependencies: solid-js: ^1.6.12 dependencies: - '@solid-primitives/refs': 1.0.4(solid-js@1.6.13) - '@solid-primitives/transition-group': 1.0.2(solid-js@1.6.13) - solid-js: 1.6.13 + '@solid-primitives/refs': 1.0.4(solid-js@1.7.8) + '@solid-primitives/transition-group': 1.0.2(solid-js@1.7.8) + solid-js: 1.7.8 dev: true /sorcery@0.11.0: @@ -26754,6 +26792,19 @@ packages: - supports-color dev: true + /tsup-preset-solid@2.0.1(esbuild@0.18.13)(solid-js@1.7.8)(tsup@7.1.0): + resolution: {integrity: sha512-gN0nD2h4909XvpMnSuqgeiKqv+Ao7Y0d1p4VuF0hnQvazBTXrFHX2ImULG4uCsvU73q2zzoDzk5Ei6iACQmk5w==} + peerDependencies: + tsup: ^7.0.0 + dependencies: + esbuild-plugin-solid: 0.5.0(esbuild@0.18.13)(solid-js@1.7.8) + tsup: 7.1.0(typescript@5.0.4) + transitivePeerDependencies: + - esbuild + - solid-js + - supports-color + dev: true + /tsup@6.7.0(typescript@5.0.4): resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} engines: {node: '>=14.18'} @@ -27361,6 +27412,24 @@ packages: transitivePeerDependencies: - supports-color + /vite-plugin-solid@2.5.0(solid-js@1.7.8)(vite@4.4.4): + resolution: {integrity: sha512-VneGd3RyFJvwaiffsqgymeMaofn0IzQLPwDzafTV2f1agoWeeJlk5VrI5WqT9BTtLe69vNNbCJWqLhHr9fOdDw==} + peerDependencies: + solid-js: ^1.3.17 || ^1.4.0 || ^1.5.0 || ^1.6.0 + vite: ^3.0.0 || ^4.0.0 + dependencies: + '@babel/core': 7.21.8 + '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) + babel-preset-solid: 1.6.10(@babel/core@7.21.8) + merge-anything: 5.1.7 + solid-js: 1.7.8 + solid-refresh: 0.4.1(solid-js@1.7.8) + vite: 4.4.4(@types/node@18.16.0) + vitefu: 0.2.4(vite@4.4.4) + transitivePeerDependencies: + - supports-color + dev: true + /vite-plugin-solid@2.7.0(solid-js@1.6.13)(vite@4.4.4): resolution: {integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==} peerDependencies: