From f4e2b1529489341b25e63d73f0dad8740d74963c Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:46:56 +1000 Subject: [PATCH 1/3] fix(solid-query): Use rollup-preset-solid --- package.json | 1 + packages/query-devtools/package.json | 1 - packages/solid-query/package.json | 26 ++++++++++--------- packages/solid-query/rollup.config.js | 37 ++++++++++++++++++++------- packages/solid-query/tsconfig.json | 2 +- pnpm-lock.yaml | 6 ++--- 6 files changed, 47 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 1bc714082d..97fd032a93 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "rollup-plugin-node-externals": "^6.1.0", "rollup-plugin-preserve-directives": "^0.2.0", "rollup-plugin-visualizer": "^5.9.0", + "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", "solid-js": "^1.6.13", "stream-to-array": "^2.3.0", diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index a42fc0fb04..ea36d90d8d 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -53,7 +53,6 @@ }, "devDependencies": { "@tanstack/query-core": "^5.0.0-alpha.43", - "rollup-preset-solid": "^2.0.1", "vite-plugin-solid": "^2.5.0" } } diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index 5a08cdea89..233df1dfac 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -11,16 +11,20 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.cjs", - "module": "build/lib/index.js", + "types": "dist/types/index.d.ts", + "main": "dist/cjs/index.cjs", + "module": "dist/esm/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "solid": "./build/lib/index.js", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "types": "./dist/types/index.d.ts", + "solid": "./dist/source/index.jsx", + "import": "./dist/esm/index.js", + "browser": { + "import": "./dist/esm/index.js", + "require": "./dist/cjs/index.cjs" + }, + "require": "./dist/cjs/index.cjs", + "node": "./dist/cjs/index.cjs" }, "./package.json": "./package.json" }, @@ -28,15 +32,13 @@ "./src/setBatchUpdatesFn.ts" ], "scripts": { - "clean": "rimraf ./build && rimraf ./coverage", + "clean": "rimraf ./dist && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "build": "rollup --config rollup.config.js" }, "files": [ "build", diff --git a/packages/solid-query/rollup.config.js b/packages/solid-query/rollup.config.js index cffa084c69..b5670cb1df 100644 --- a/packages/solid-query/rollup.config.js +++ b/packages/solid-query/rollup.config.js @@ -1,12 +1,31 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'solid-query', - outputFile: 'index', - entryFile: './src/index.ts', - }), -) +import withSolid from 'rollup-preset-solid' + +export function createSolidQueryConfig() { + const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ ( + withSolid({ + input: `./src/index.ts`, + targets: ['esm', 'cjs'], + external: ['@tanstack/query-core'], + }) + ) + + const outputs = !solidRollupOptions.output + ? [] + : Array.isArray(solidRollupOptions.output) + ? solidRollupOptions.output + : [solidRollupOptions.output] + + outputs.forEach((output) => { + if (output.format === 'cjs') { + output.entryFileNames = '[name].cjs' + output.chunkFileNames = '[name]-[hash].cjs' + } + }) + + return solidRollupOptions +} + +export default defineConfig(createSolidQueryConfig()) diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json index 03b5d30883..43908c0dde 100644 --- a/packages/solid-query/tsconfig.json +++ b/packages/solid-query/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "jsx": "preserve", "jsxImportSource": "solid-js", - "outDir": "./build/lib", + "outDir": "./dist", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 43f204a067..993e5b0b86 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -174,6 +174,9 @@ importers: rollup-plugin-visualizer: specifier: ^5.9.0 version: 5.9.0(rollup@3.23.0) + rollup-preset-solid: + specifier: ^2.0.1 + version: 2.0.1 semver: specifier: ^7.5.1 version: 7.5.1 @@ -1398,9 +1401,6 @@ importers: '@tanstack/query-core': specifier: ^5.0.0-alpha.43 version: link:../query-core - rollup-preset-solid: - specifier: ^2.0.1 - version: 2.0.1 vite-plugin-solid: specifier: ^2.5.0 version: 2.6.1(solid-js@1.6.16)(vite@4.2.1) From 70001140c9eca6a64ba2249a85d5b848bbdf8b8a Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Mon, 12 Jun 2023 18:40:27 +1000 Subject: [PATCH 2/3] Update published files --- packages/solid-query/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index cb6329effe..29d4754453 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -41,7 +41,7 @@ "build": "rollup --config rollup.config.js" }, "files": [ - "build", + "dist", "src" ], "dependencies": { From c74e6f63879cec58634901f5c389394b009854b7 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Mon, 12 Jun 2023 18:52:34 +1000 Subject: [PATCH 3/3] Fix prettier --- packages/solid-query/rollup.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/rollup.config.js b/packages/solid-query/rollup.config.js index b5670cb1df..dd136baaeb 100644 --- a/packages/solid-query/rollup.config.js +++ b/packages/solid-query/rollup.config.js @@ -25,7 +25,7 @@ export function createSolidQueryConfig() { } }) - return solidRollupOptions + return solidRollupOptions } export default defineConfig(createSolidQueryConfig())