Skip to content

Commit

Permalink
fix: #27 - enable mixing components from different kits
Browse files Browse the repository at this point in the history 
examples: upgrade to latest typescript, react, threejs, R3F version
  • Loading branch information
@bbohlender
bbohlender committed Apr 29, 2024
1 parent a74e9bf commit 4d7d1aa
Show file tree
Hide file tree
Showing 30 changed files with 766 additions and 513 deletions.
4 changes: 0 additions & 4 deletions apps/html23/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-tooltip": "^1.0.7",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.2",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-default": "workspace:^",
Expand All @@ -29,15 +28,13 @@
"lucide-react": "^0.368.0",
"prism-react-renderer": "^2.3.1",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-resizable-panels": "^2.0.17",
"react-simple-code-editor": "^0.13.1",
"shadcn-ui": "^0.8.0",
"suspend-react": "^0.1.3",
"tailwind-merge": "^2.2.2",
"tailwindcss-animate": "^1.0.7",
"three": "^0.161.0",
"zod": "^3.22.4",
"zustand": "^4.5.2"
},
Expand All @@ -46,7 +43,6 @@
"build": "vite build"
},
"devDependencies": {
"@types/three": "^0.161.0",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"tailwindcss": "^3.4.3"
Expand Down
1 change: 1 addition & 0 deletions apps/html23/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default defineConfig({
alias: {
'@': path.resolve(__dirname, './src'),
},
dedupe: ['@react-three/fiber'],
},
base: '/uikit/apps/html23/',
optimizeDeps: {
Expand Down
6 changes: 1 addition & 5 deletions examples/apfel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@
"@coconut-xr/xinteraction": "^0.1.12",
"@preact/signals-core": "^1.5.1",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.0",
"@react-three/rapier": "^1.3.0",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"@splinetool/r3f-spline": "^1.0.2",
"@types/three": "^0.161.0",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"maath": "^0.10.7",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions examples/apfel/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/apfel/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
6 changes: 1 addition & 5 deletions examples/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@
"type": "module",
"dependencies": {
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.0",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"@types/three": "^0.161.0",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions examples/auth/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/default/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
6 changes: 1 addition & 5 deletions examples/card/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
"dependencies": {
"@preact/signals-core": "^1.5.1",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.0",
"@react-three/rapier": "^1.3.0",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"@splinetool/r3f-spline": "^1.0.2",
"@types/three": "^0.161.0",
"maath": "^0.10.7",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions examples/card/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/default/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
4 changes: 0 additions & 4 deletions examples/dashboard/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
"dependencies": {
"@coconut-xr/xinteraction": "^0.1.12",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.0",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"@types/three": "^0.161.0",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0",
"vite-plugin-mkcert": "^1.17.4",
"zustand": "4"
},
Expand Down
1 change: 1 addition & 0 deletions examples/dashboard/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/default/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
5 changes: 1 addition & 4 deletions examples/default/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
"@coconut-xr/xinteraction": "^0.1.12",
"@preact/signals-core": "^1.5.1",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions examples/default/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/default/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
2 changes: 0 additions & 2 deletions examples/lucide/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
"type": "module",
"dependencies": {
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions examples/lucide/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ export default defineConfig({
base: '/uikit/examples/lucide/',
resolve: {
alias: [{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') }],
dedupe: ['@react-three/fiber'],
},
})
6 changes: 1 addition & 5 deletions examples/market/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@
"type": "module",
"dependencies": {
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/postprocessing": "^2.16.0",
"@react-three/uikit": "workspace:^",
"@react-three/uikit-lucide": "workspace:^",
"@types/three": "^0.161.0",
"r3f-perf": "^7.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions examples/market/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, '../../packages/kits/default/src') },
{ find: '@react-three/uikit', replacement: path.resolve(__dirname, '../../packages/react/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
8 changes: 1 addition & 7 deletions examples/uikit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@
"dependencies": {
"@preact/signals-core": "^1.5.1",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@react-three/uikit": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host"
},
"devDependencies": {
"@types/three": "^0.161.0"
}
}
1 change: 1 addition & 0 deletions examples/uikit/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export default defineConfig({
},
{ find: '@pmndrs/uikit', replacement: path.resolve(__dirname, '../../packages/uikit/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
})
6 changes: 1 addition & 5 deletions examples/vanilla/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
"dependencies": {
"@pmndrs/uikit": "workspace:^",
"@pmndrs/uikit-lucide": "workspace:^",
"react-dom": "^18.2.0",
"three": "^0.161.0"
"react-dom": "^18.2.0"
},
"scripts": {
"dev": "vite --host"
},
"devDependencies": {
"@types/three": "^0.161.0"
}
}
1 change: 1 addition & 0 deletions examples/vanilla/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default defineConfig({
},
{ find: '@pmndrs/uikit', replacement: path.resolve(__dirname, '../../packages/uikit/src/index.ts') },
],
dedupe: ['@react-three/fiber'],
},
base: '/uikit/examples/vanilla/',
optimizeDeps: {
Expand Down
6 changes: 5 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
"type": "module",
"devDependencies": {
"@react-three/eslint-plugin": "^0.1.1",
"@react-three/fiber": "^8.16.2",
"@types/chai": "^4.3.10",
"@types/chai-as-promised": "^7.1.8",
"@types/mocha": "^10.0.4",
"@types/node": "^20.11.0",
"@types/react": "^18.2.47",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.2.18",
"@types/three": "^0.164.0",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"@vitejs/plugin-react": "^4.2.1",
Expand All @@ -24,6 +26,8 @@
"json": "^11.0.0",
"mocha": "^10.2.0",
"prettier": "^3.2.5",
"react": "^18.3.1",
"three": "^0.164.0",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"typescript-json-schema": "^0.63.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/icons/lucide/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
"@react-three/uikit": "workspace:^"
},
"devDependencies": {
"@types/node": "^20.11.0",
"@types/react": "^18.2.47",
"react": "^18.2.0"
"@types/node": "^20.11.0"
}
}
3 changes: 1 addition & 2 deletions packages/icons/lucide/vanilla/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@pmndrs/uikit": "workspace:^"
},
"devDependencies": {
"@types/node": "^20.11.0",
"@types/react": "^18.2.47"
"@types/node": "^20.11.0"
}
}
6 changes: 1 addition & 5 deletions packages/kits/apfel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@
"fix:eslint": "eslint '**/*.{tsx,ts}' --fix"
},
"devDependencies": {
"@preact/signals-core": "^1.5.1",
"@react-three/fiber": "^8.15.13",
"@types/react": "^18.2.47",
"@types/three": "^0.161.0",
"three": "^0.161.0"
"@preact/signals-core": "^1.5.1"
},
"type": "module",
"dependencies": {
Expand Down
7 changes: 1 addition & 6 deletions packages/kits/default/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@
"fix:eslint": "eslint '**/*.{tsx,ts}' --fix"
},
"devDependencies": {
"@preact/signals-core": "^1.5.1",
"@react-three/fiber": "^8.15.13",
"@types/react": "^18.2.47",
"react": "^18.2.0",
"@types/three": "^0.161.0",
"three": "^0.161.0"
"@preact/signals-core": "^1.5.1"
},
"type": "module",
"dependencies": {
Expand Down
7 changes: 1 addition & 6 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,9 @@
},
"devDependencies": {
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.13",
"@types/prompts": "^2.4.9",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@types/three": "^0.161.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"replace-in-files-cli": "^2.2.0",
"three": "^0.161.0"
"replace-in-files-cli": "^2.2.0"
}
}
10 changes: 5 additions & 5 deletions packages/react/src/cli/component/add.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ export const add = new Command('add')
).path as string
}

const absPath = resolve(cwd, path)
const absPath = resolve(cwd, path, kit)

if (!existsSync(path)) {
if (!existsSync(absPath)) {
await mkdir(absPath, { recursive: true })
}

const absThemePath = resolve(path, 'base-theme.tsx')
const absThemePath = resolve(absPath, 'theme.tsx')
if (!existsSync(absThemePath)) {
await download(kit, 'theme.tsx', absThemePath)
await download(kit, 'base-theme.tsx', absThemePath)
}

const componentsToInstall = new Set<string>()
Expand Down Expand Up @@ -134,7 +134,7 @@ export const add = new Command('add')
})

async function download(kit: string, file: string, targetAbsolutePath: string) {
const response = await fetch(`${BASE_URL}${kit}/${file}`)
const response = await fetch(`${BASE_URL}${kit}/src/${file}`)
if (response.body == null) {
throw new Error(`Invalid response when downloading ${file} from registry: ${response.statusText}`)
}
Expand Down
4 changes: 1 addition & 3 deletions packages/uikit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
"yoga-layout": "^3.0.4"
},
"devDependencies": {
"@types/node": "^20.11.0",
"@types/three": "^0.161.0",
"three": "^0.161.0"
"@types/node": "^20.11.0"
}
}
2 changes: 1 addition & 1 deletion packages/uikit/src/vanilla/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ParentContext } from '../context.js'
import { FontFamilies } from '../text/index.js'

const _addedEvent = { type: 'added' as const }
const _childaddedEvent = { type: 'childadded' as const, child: null as null | Object3D }
const _childaddedEvent = { type: 'childadded' as const, child: null as any }

export function createParentContextSignal() {
return signal<
Expand Down
Loading

0 comments on commit 4d7d1aa

Please sign in to comment.