Skip to content

Commit 25d1981

Browse files
committed
fix bundling isues
1 parent 7506426 commit 25d1981

8 files changed

Lines changed: 83 additions & 21 deletions

File tree

knip.json

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,31 @@
11
{
22
"$schema": "https://unpkg.com/knip@5/schema.json",
3-
"ignoreDependencies": ["@faker-js/faker"],
4-
"ignoreWorkspaces": ["examples/**"],
3+
"ignoreDependencies": [
4+
"@faker-js/faker"
5+
],
6+
"ignoreWorkspaces": [
7+
"examples/**"
8+
],
59
"workspaces": {
610
"packages/devtools-utils": {
7-
"ignoreDependencies": ["react", "solid-js", "@types/react"]
11+
"ignoreDependencies": [
12+
"react",
13+
"solid-js",
14+
"@types/react"
15+
],
16+
"entry": [
17+
"**/vite.config.solid.ts",
18+
"**/src/solid/**"
19+
],
20+
"project": [
21+
"**/vite.config.solid.ts",
22+
"**/src/solid/**"
23+
]
824
},
925
"packages/solid-devtools": {
10-
"ignore": ["**/core.tsx"]
26+
"ignore": [
27+
"**/core.tsx"
28+
]
1129
}
1230
}
13-
}
31+
}

packages/devtools-utils/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
"exports": {
2222
"./react": {
2323
"import": {
24-
"types": "./dist/esm/react/index.d.ts",
25-
"default": "./dist/esm/react/index.js"
24+
"types": "./dist/react/esm/index.d.ts",
25+
"default": "./dist/react/esm/index.js"
2626
}
2727
},
2828
"./solid": {
2929
"import": {
30-
"types": "./dist/esm/solid/index.d.ts",
31-
"default": "./dist/esm/solid/index.js"
30+
"types": "./dist/solid/esm/index.d.ts",
31+
"default": "./dist/solid/esm/index.js"
3232
}
3333
},
3434
"./package.json": "./package.json"
@@ -41,8 +41,8 @@
4141
"@tanstack/devtools-ui": "workspace:^"
4242
},
4343
"peerDependencies": {
44-
"@types/react": ">=17.0.0",
45-
"react": ">=17.0.0",
44+
"@types/react": ">=19.0.0",
45+
"react": ">=19.0.0",
4646
"solid-js": ">=1.9.7"
4747
},
4848
"peerDependenciesMeta": {
@@ -68,6 +68,6 @@
6868
"test:lib:dev": "pnpm test:lib --watch",
6969
"test:types": "tsc",
7070
"test:build": "publint --strict",
71-
"build": "vite build"
71+
"build": "vite build && vite build --config ./vite.config.solid.ts"
7272
}
73-
}
73+
}

packages/devtools-utils/src/react/panel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useRef } from 'react'
1+
import { useEffect, useRef } from 'react'
22

33
export interface DevtoolsPanelProps {
44
theme?: 'light' | 'dark'
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
22
"compilerOptions": {
3-
"jsx": "preserve"
3+
"jsx": "react-jsx",
4+
"jsxImportSource": "react"
45
},
56
"extends": "../../tsconfig.json",
67
"include": [
78
"src",
89
"eslint.config.js",
910
"vite.config.ts",
1011
"tests",
11-
"src/server"
12+
"src/server",
13+
"vite.config.solid.ts"
1214
]
1315
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"compilerOptions": {
3+
"jsx": "preserve",
4+
"jsxImportSource": "solid-js",
5+
},
6+
"extends": "../../tsconfig.json",
7+
"include": [
8+
"src",
9+
"eslint.config.js",
10+
"vite.config.ts",
11+
"tests",
12+
"src/server"
13+
]
14+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { defineConfig, mergeConfig } from 'vitest/config'
2+
import { tanstackViteConfig } from '@tanstack/config/vite'
3+
import packageJson from './package.json'
4+
5+
const config = defineConfig({
6+
plugins: [],
7+
test: {
8+
name: packageJson.name,
9+
dir: './',
10+
watch: false,
11+
environment: 'jsdom',
12+
setupFiles: ['./tests/test-setup.ts'],
13+
globals: true,
14+
},
15+
})
16+
17+
export default mergeConfig(
18+
config,
19+
tanstackViteConfig({
20+
entry: ['./src/solid/index.ts',],
21+
srcDir: './src/solid',
22+
tsconfigPath: './tsconfig.json',
23+
outDir: './dist/solid',
24+
cjs: false
25+
}),
26+
)

packages/devtools-utils/vite.config.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ const config = defineConfig({
1717
export default mergeConfig(
1818
config,
1919
tanstackViteConfig({
20-
entry: ['./src/react/index.ts', './src/solid/index.ts'],
21-
srcDir: './src',
22-
cjs: false,
20+
entry: ['./src/react/index.ts',],
21+
srcDir: './src/react',
22+
tsconfigPath: './tsconfig.json',
23+
outDir: './dist/react',
24+
cjs: false
2325
}),
2426
)

pnpm-lock.yaml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)