Skip to content

feat: Replace rollup with tsup/esbuild #5597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lachlancollins merged 32 commits into from
Jul 19, 2023
Merged

feat: Replace rollup with tsup/esbuild #5597

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
73e2a59
Demo tsup v7
lachlancollins Jun 16, 2023
f87ea89
Use tsc to build d.ts
lachlancollins Jun 17, 2023
f27ff7b
Test tsup for react-query
lachlancollins Jun 17, 2023
6fe8290
Update tsup target
lachlancollins Jun 17, 2023
c16aca7
Add config to eslint-plugin-query
lachlancollins Jun 17, 2023
cbe67a4
Remove legacy extension
lachlancollins Jun 17, 2023
be1f6e8
Target browsers
lachlancollins Jun 17, 2023
3aa5b90
Merge branch 'alpha' into tsup
TkDodo Jun 17, 2023
955dc9d
Merge branch 'alpha' into tsup
lachlancollins Jun 18, 2023
631eb61
Merge branch 'alpha' into tsup
lachlancollins Jul 3, 2023
91f2dae
Merge branch 'alpha' into tsup
lachlancollins Jul 3, 2023
92a9067
Generate types with tsup
lachlancollins Jul 3, 2023
07c56a8
Generate modern and legacy builds
lachlancollins Jul 3, 2023
870ee13
Add tsup config helpers
lachlancollins Jul 3, 2023
33209f3
Add bundle option to tsup config
lachlancollins Jul 3, 2023
0e01945
Fix package.json build paths
lachlancollins Jul 3, 2023
9c4f14b
Merge branch 'alpha' into tsup
TkDodo Jul 15, 2023
3bb39f0
Merge branch 'alpha' into tsup
lachlancollins Jul 15, 2023
3c6d1b3
Merge branch 'alpha' into tsup
lachlancollins Jul 16, 2023
f2fb747
Preserve optional chaining
lachlancollins Jul 16, 2023
5aa6660
Merge branch 'alpha' into tsup
lachlancollins Jul 16, 2023
0bc367a
Update supported browsers docs
lachlancollins Jul 17, 2023
5311efd
Migrate some other packages
lachlancollins Jul 17, 2023
3551d90
Convert vue-query
lachlancollins Jul 17, 2023
f1a87b7
Remove getRollupConfig.js
lachlancollins Jul 17, 2023
5d89203
Merge branch 'alpha' into tsup
lachlancollins Jul 17, 2023
62879e8
Fix forceEnv option
lachlancollins Jul 17, 2023
2c8cd1d
Remove babel and browserslistrc
lachlancollins Jul 18, 2023
e59eaed
Alternate production export
lachlancollins Jul 18, 2023
850d98e
Fix missing devtools in production
lachlancollins Jul 18, 2023
f4af223
Merge branch 'alpha' into tsup
lachlancollins Jul 18, 2023
d7f14d8
feat(solid-query & devtools): Use tsup (#1)
ardeora Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/eslint-plugin-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
"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": "build/legacy/index.d.ts",
"main": "build/legacy/index.cjs",
"module": "build/legacy/index.js",
"exports": {
".": {
"import": {
"types": "./build/lib/index.d.ts",
"default": "./build/lib/index.js"
"types": "./build/legacy/index.d.ts",
"default": "./build/legacy/index.js"
},
"require": {
"types": "./build/lib/index.d.cts",
"default": "./build/lib/index.cjs"
"types": "./build/legacy/index.d.cts",
"default": "./build/legacy/index.cjs"
}
},
"./package.json": "./package.json"
Expand Down
13 changes: 4 additions & 9 deletions packages/eslint-plugin-query/tsup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
// @ts-check

import { defineConfig } from 'tsup'
import { legacyConfig } from '../../scripts/getTsupConfig.js'

export default defineConfig({
entry: ['src/index.ts'],
format: ['cjs', 'esm'],
target: ['es2020', 'node16'],
outDir: 'build/lib',
dts: true,
sourcemap: true,
clean: true,
})
export default defineConfig([
legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'], bundle: true }),
])
26 changes: 14 additions & 12 deletions packages/query-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,25 @@
"url": "https://github.com/sponsors/tannerlinsley"
},
"type": "module",
"types": "build/lib/index.d.ts",
"main": "build/lib/index.legacy.cjs",
"module": "build/lib/index.legacy.js",
"types": "build/legacy/index.d.ts",
"main": "build/legacy/index.cjs",
"module": "build/legacy/index.js",
"exports": {
".": {
"types": "./build/lib/index.d.ts",
"import": "./build/lib/index.js",
"require": "./build/lib/index.cjs",
"default": "./build/lib/index.cjs"
"import": {
"types": "./build/modern/index.d.ts",
"default": "./build/modern/index.js"
},
"require": {
"types": "./build/modern/index.d.cts",
"default": "./build/modern/index.cjs"
}
},
"./package.json": "./package.json"
},
"sideEffects": false,
"files": [
"build/lib/*",
"build",
"src"
],
"scripts": {
Expand All @@ -34,9 +38,7 @@
"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"
"test:build": "publint --strict && attw --pack",
"build": "tsup"
}
}
12 changes: 0 additions & 12 deletions packages/query-core/rollup.config.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/query-core/tsconfig.eslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"compilerOptions": {
"noEmit": true
},
"include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"]
"include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
}
9 changes: 9 additions & 0 deletions packages/query-core/tsup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @ts-check

import { defineConfig } from 'tsup'
import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js'

export default defineConfig([
modernConfig({ entry: ['src/*.ts'], bundle: false }),
legacyConfig({ entry: ['src/*.ts'], bundle: false }),
])
30 changes: 16 additions & 14 deletions packages/react-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@
"url": "https://github.com/sponsors/tannerlinsley"
},
"type": "module",
"types": "build/lib/index.d.ts",
"main": "build/lib/index.legacy.cjs",
"module": "build/lib/index.legacy.js",
"types": "build/legacy/index.d.ts",
"main": "build/legacy/index.cjs",
"module": "build/legacy/index.js",
"exports": {
".": {
"types": "./build/lib/index.d.ts",
"import": "./build/lib/index.js",
"require": "./build/lib/index.cjs",
"default": "./build/lib/index.cjs"
"import": {
"types": "./build/modern/index.d.ts",
"default": "./build/modern/index.js"
},
"require": {
"types": "./build/modern/index.d.cts",
"default": "./build/modern/index.cjs"
}
},
"./package.json": "./package.json"
},
Expand All @@ -30,16 +34,14 @@
"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:codemods && pnpm build:types",
"build:rollup": "rollup --config rollup.config.js",
"build:codemods": "cpy ../codemods/src/**/* ./build/codemods",
"build:types": "tsc --emitDeclarationOnly"
"test:build": "publint --strict && attw --pack",
"build": "pnpm build:tsup && pnpm build:codemods",
"build:tsup": "tsup",
"build:codemods": "cpy ../codemods/src/**/* ./build/codemods"
},
"files": [
"build/lib/*",
"build",
"src",
"build/codemods",
"!build/codemods/jest.config.js",
"!build/codemods/**/__testfixtures__",
"!build/codemods/**/__tests__"
Expand Down
12 changes: 0 additions & 12 deletions packages/react-query/rollup.config.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react-query/tsconfig.eslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"compilerOptions": {
"noEmit": true
},
"include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"]
"include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
}
9 changes: 9 additions & 0 deletions packages/react-query/tsup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @ts-check

import { defineConfig } from 'tsup'
import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js'

export default defineConfig([
modernConfig({ entry: ['src/*.ts', 'src/*.tsx'], bundle: false }),
legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'], bundle: false }),
])
41 changes: 41 additions & 0 deletions scripts/getTsupConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// @ts-check

/**
* @param {Object} opts - Options for building configurations.
* @param {string[]} opts.entry - The entry array.
* @param {boolean} opts.bundle - Whether to bundle the output.
* @returns {import('tsup').Options}
*/
export function modernConfig(opts) {
return {
entry: opts.entry,
format: ['cjs', 'esm'],
target: ['chrome84', 'firefox90', 'edge84', 'safari15', 'ios15', 'opera70'],
outDir: 'build/modern',
bundle: opts.bundle,
splitting: opts.bundle,
dts: true,
sourcemap: true,
clean: true,
}
}

/**
* @param {Object} opts - Options for building configurations.
* @param {string[]} opts.entry - The entry array.
* @param {boolean} opts.bundle - Whether to bundle the output.
* @returns {import('tsup').Options}
*/
export function legacyConfig(opts) {
return {
entry: opts.entry,
format: ['cjs', 'esm'],
target: ['es2020', 'node16'],
outDir: 'build/legacy',
bundle: opts.bundle,
splitting: opts.bundle,
dts: true,
sourcemap: true,
clean: true,
}
}