Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/metal-games-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tanstack/angular-query-experimental": patch
---

build: switch to tsdown
5 changes: 1 addition & 4 deletions knip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export default {
ignoreDependencies: ['react', 'react-dom'],
},
'packages/angular-query-experimental': {
entry: [
'src/devtools/production/index.ts!',
'src/devtools-panel/production/index.ts!',
],
ignore: ['scripts/prepack.js'],
// Strict mode excludes optional dependencies. Read the declared names
// so removing a declaration still causes an unlisted dependency error.
ignoreDependencies: Object.keys(
Expand Down
33 changes: 11 additions & 22 deletions packages/angular-query-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,44 @@
"test:types:ts70": "node ../../node_modules/typescript70/lib/tsc.js --project tsconfig.json --outDir .cache/test-types/ts70 --tsBuildInfoFile .cache/test-types/ts70.tsbuildinfo",
"test:lib": "vitest",
"test:lib:dev": "pnpm run test:lib --watch",
"test:build": "pnpm pack && publint ./dist/*.tgz --strict && attw ./dist/*.tgz; premove ./dist/*.tgz",
"build": "vite build",
"prepack": "node scripts/prepack.js"
"build": "tsdown --tsconfig tsconfig.prod.json"
},
"type": "module",
"types": "dist/index.d.ts",
"types": "dist/index.d.mts",
"module": "dist/index.mjs",
"exports": {
".": {
"@tanstack/custom-condition": "./src/index.ts",
"types": "./dist/index.d.ts",
"types": "./dist/index.d.mts",
"default": "./dist/index.mjs"
},
"./package.json": "./package.json",
"./inject-queries-experimental": {
"types": "./dist/inject-queries-experimental/index.d.ts",
"types": "./dist/inject-queries-experimental/index.d.mts",
"default": "./dist/inject-queries-experimental/index.mjs"
},
"./devtools": {
"types": "./dist/devtools/index.d.ts",
"types": "./dist/devtools/index.d.mts",
"development": "./dist/devtools/index.mjs",
"default": "./dist/devtools/stub.mjs"
},
"./devtools/production": {
"types": "./dist/devtools/production/index.d.ts",
"types": "./dist/devtools/production/index.d.mts",
"default": "./dist/devtools/index.mjs"
},
"./devtools-panel": {
"types": "./dist/devtools-panel/index.d.ts",
"types": "./dist/devtools-panel/index.d.mts",
"development": "./dist/devtools-panel/index.mjs",
"default": "./dist/devtools-panel/stub.mjs"
},
"./devtools-panel/production": {
"types": "./dist/devtools-panel/production/index.d.ts",
"types": "./dist/devtools-panel/production/index.d.mts",
"default": "./dist/devtools-panel/index.mjs"
}
},
"sideEffects": false,
"files": [
"**/*.d.ts",
"**/*.mjs",
"**/*.mjs.map"
"dist",
"src"
],
"dependencies": {
"@tanstack/query-core": "workspace:*"
Expand All @@ -93,20 +89,13 @@
"@tanstack/query-test-utils": "workspace:*",
"@testing-library/angular": "^18.0.0",
"npm-run-all2": "^9.0.3",
"rxjs": "^7.8.2",
"vite-plugin-dts": "4.2.3",
"vite-plugin-externalize-deps": "^0.9.0",
"vite-tsconfig-paths": "^5.1.4"
"rxjs": "^7.8.2"
},
"optionalDependencies": {
"@tanstack/query-devtools": "workspace:*"
},
"peerDependencies": {
"@angular/common": ">=16.0.0",
"@angular/core": ">=16.0.0"
},
"publishConfig": {
"directory": "dist",
"linkDirectory": false
}
}
7 changes: 1 addition & 6 deletions packages/angular-query-experimental/tsconfig.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
"compilerOptions": {
"incremental": false,
"composite": false,
"rootDir": "../../",
"customConditions": null,
// vite-plugin-dts must not depend on a generated query-core build.
"paths": {
"@tanstack/query-core": ["../query-core/src/index.ts"]
}
"rootDir": "../../"
},
"include": ["src"],
"exclude": ["src/__tests__"]
Expand Down
23 changes: 23 additions & 0 deletions packages/angular-query-experimental/tsdown.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { defineConfig } from 'tsdown'

export default defineConfig({
entry: ['src/**/*.ts', '!src/__tests__/**'],
format: ['esm'],
target: ['chrome91', 'firefox90', 'edge91', 'safari15', 'ios15', 'opera77'],
// Rolldown lowers private fields for browser target arrays. Keep the
// transform target at ES2022 to match the syntax that tsup emitted.
inputOptions: { transform: { target: 'es2022' } },
outDir: 'dist',
unbundle: true,
dts: true,
fixedExtension: true,
sourcemap: true,
clean: true,
publint: {
strict: true,
},
attw: {
profile: 'esm-only',
level: 'error',
},
})
101 changes: 2 additions & 99 deletions packages/angular-query-experimental/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { externalizeDeps } from 'vite-plugin-externalize-deps'
import tsconfigPaths from 'vite-tsconfig-paths'
import dts from 'vite-plugin-dts'
import { defineConfig } from 'vitest/config'
import packageJson from './package.json'
import type { Options } from '@tanstack/vite-config'

function ensureImportFileExtension({
content,
extension,
}: {
content: string
extension: string
}) {
// replace e.g. `import { foo } from './foo'` with `import { foo } from './foo.js'`
content = content.replace(
/(im|ex)port\s[\w{}/*\s,]+from\s['"](?:\.\.?\/)+?[^.'"]+(?=['"];?)/gm,
`$&.${extension}`,
)

// replace e.g. `import('./foo')` with `import('./foo.js')`
content = content.replace(
/import\(['"](?:\.\.?\/)+?[^.'"]+(?=['"];?)/gm,
`$&.${extension}`,
)
return content
}

const config = defineConfig({
// fix from https://github.com/vitest-dev/vitest/issues/6992#issuecomment-2509408660
Expand Down Expand Up @@ -56,76 +31,4 @@ const config = defineConfig({
},
})

// copy from @tanstack/config/vite with changes:
// - build - lib - fileName: [name.mjs]
// - rollup - output - preserveModulesRoot: src
export const tanstackViteConfig = (options: Options) => {
const outDir = options.outDir ?? 'dist'
const cjs = options.cjs ?? true

return defineConfig({
plugins: [
externalizeDeps({ include: options.externalDeps ?? [] }),
tsconfigPaths({
projects: options.tsconfigPath ? [options.tsconfigPath] : undefined,
}),
dts({
outDir,
entryRoot: options.srcDir,
include: options.srcDir,
exclude: options.exclude,
tsconfigPath: options.tsconfigPath,
compilerOptions: {
module: 99, // ESNext
declarationMap: false,
},
beforeWriteFile: (filePath, content) => {
return {
filePath,
content: ensureImportFileExtension({ content, extension: 'js' }),
}
},
afterDiagnostic: (diagnostics) => {
if (diagnostics.length > 0) {
console.error('Please fix the above type errors')
process.exit(1)
}
},
}),
],
build: {
outDir,
minify: false,
sourcemap: true,
lib: {
entry: options.entry,
formats: cjs ? ['es', 'cjs'] : ['es'],
fileName: () => '[name].mjs',
},
rollupOptions: {
output: {
preserveModules: true,
preserveModulesRoot: 'src',
},
},
},
})
}

export default mergeConfig(
config,
tanstackViteConfig({
cjs: false,
entry: [
'./src/index.ts',
'./src/inject-queries-experimental/index.ts',
'./src/devtools-panel/index.ts',
'./src/devtools-panel/stub.ts',
'./src/devtools/index.ts',
'./src/devtools/stub.ts',
],
exclude: ['src/__tests__'],
srcDir: './src',
tsconfigPath: 'tsconfig.prod.json',
}),
)
export default config
20 changes: 0 additions & 20 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading