From 7ceeed7e12acc439d0d0889fc4e40f265e945a84 Mon Sep 17 00:00:00 2001 From: Riccardo Perra Date: Sun, 9 Apr 2023 09:56:32 +0200 Subject: [PATCH] chore: align solid-js version --- packages/kit/package.json | 2 +- .../kit/src/components/Button/ButtonIcon.tsx | 8 +- packages/playground/package.json | 1 - packages/playground/src/App.tsx | 5 +- packages/playground/src/demo/Button.tsx | 2 +- packages/playground/src/demo/Popover.tsx | 21 --- pnpm-lock.yaml | 136 ++---------------- tsconfig.json | 5 + 8 files changed, 18 insertions(+), 162 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 8e9414a..45155d9 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -58,7 +58,7 @@ "jest-environment-jsdom": "^28.1.3", "rollup": "^3.20.2", "rollup-preset-solid": "^2.0.1", - "solid-js": "^1.6.15", + "solid-js": "^1.7.3", "solid-testing-library": "^0.3.0", "ts-node": "^10.9.1", "typescript": "^4.9.5", diff --git a/packages/kit/src/components/Button/ButtonIcon.tsx b/packages/kit/src/components/Button/ButtonIcon.tsx index cd68dae..bbb9b95 100644 --- a/packages/kit/src/components/Button/ButtonIcon.tsx +++ b/packages/kit/src/components/Button/ButtonIcon.tsx @@ -2,11 +2,5 @@ import * as styles from "./Button.css"; import { JSX, splitProps } from "solid-js"; export function ButtonIcon(props: JSX.IntrinsicElements["span"]) { - const [local, others] = splitProps(props, ["class", "children"]); - - return ( - - {local.children} - - ); + return ; } diff --git a/packages/playground/package.json b/packages/playground/package.json index 812d44c..240ec88 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -69,7 +69,6 @@ }, "packageManager": "pnpm@7.5.0", "dependencies": { - "@codeui/kit": "workspace:*", "@kobalte/core": "^0.8.2", "@kobalte/utils": "^0.6.1", "@kobalte/vanilla-extract": "^0.3.0", diff --git a/packages/playground/src/App.tsx b/packages/playground/src/App.tsx index 2ceddfd..d759626 100644 --- a/packages/playground/src/App.tsx +++ b/packages/playground/src/App.tsx @@ -1,7 +1,6 @@ import type { Component } from "solid-js"; import { createEffect, createSignal } from "solid-js"; import { DialogDemo } from "./demo/Dialog"; -import { ButtonDemo } from "./demo/Button"; import { TextInputDemo } from "./demo/TextInput"; import { DemoSection } from "./ui/DemoSection"; import { DropdownMenuDemo } from "./demo/DropdownMenu"; @@ -33,9 +32,7 @@ const App: Component = () => { onChange={v => setTheme(v.currentTarget.value)} /> - - - + diff --git a/packages/playground/src/demo/Button.tsx b/packages/playground/src/demo/Button.tsx index 665cca9..5053657 100644 --- a/packages/playground/src/demo/Button.tsx +++ b/packages/playground/src/demo/Button.tsx @@ -1,4 +1,4 @@ -import { For, JSX } from "solid-js"; +import { For } from "solid-js"; import { Button, ButtonProps, IconButton } from "@codeui/kit"; import { DemoSectionRow } from "../ui/DemoSection"; diff --git a/packages/playground/src/demo/Popover.tsx b/packages/playground/src/demo/Popover.tsx index 579055d..ad38cac 100644 --- a/packages/playground/src/demo/Popover.tsx +++ b/packages/playground/src/demo/Popover.tsx @@ -41,27 +41,6 @@ export function PopoverDemo() { with SolidJS. - - - - - Open (controlled) - - - About Kobalte A UI toolkit - - - - - - Custom position - - - - About Kobalte A UI toolkit for building accessible web apps and design systems - with SolidJS. - - ); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b31f20..d5618c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -59,17 +59,17 @@ importers: polished: ^4.2.2 rollup: ^3.20.2 rollup-preset-solid: ^2.0.1 - solid-js: ^1.6.15 + solid-js: ^1.7.3 solid-testing-library: ^0.3.0 statebuilder: ^0.3.1 ts-node: ^10.9.1 typescript: ^4.9.5 vite-tsconfig-paths: ^4.0.7 dependencies: - '@kobalte/core': 0.8.2_solid-js@1.6.15 - '@kobalte/utils': 0.6.1_solid-js@1.6.15 + '@kobalte/core': 0.8.2_solid-js@1.7.3 + '@kobalte/utils': 0.6.1_solid-js@1.7.3 '@kobalte/vanilla-extract': 0.3.0_sj7ql4kjoy7ivqenazaubmmhp4 - '@motionone/solid': 10.16.0_solid-js@1.6.15 + '@motionone/solid': 10.16.0_solid-js@1.7.3 '@radix-ui/colors': 0.1.8 '@vanilla-extract/css': 1.11.0 '@vanilla-extract/dynamic': 2.0.3 @@ -85,8 +85,8 @@ importers: jest-environment-jsdom: 28.1.3 rollup: 3.20.2 rollup-preset-solid: 2.0.1 - solid-js: 1.6.15 - solid-testing-library: 0.3.0_solid-js@1.6.15 + solid-js: 1.7.3 + solid-testing-library: 0.3.0_solid-js@1.7.3 ts-node: 10.9.1_z3vu5dg2hu3jqyh3anri5tms2q typescript: 4.9.5 vite-tsconfig-paths: 4.0.7_27d6rnnqnnz33bvg4pqy2xno6y @@ -94,7 +94,6 @@ importers: packages/playground: specifiers: '@codeimage/vanilla-extract': workspace:^0.2.0 - '@codeui/kit': workspace:* '@kobalte/core': ^0.8.2 '@kobalte/utils': ^0.6.1 '@kobalte/vanilla-extract': ^0.3.0 @@ -120,7 +119,6 @@ importers: vite-plugin-solid: ^2.7.0 vite-tsconfig-paths: ^4.0.8 dependencies: - '@codeui/kit': link:../kit '@kobalte/core': 0.8.2_solid-js@1.7.3 '@kobalte/utils': 0.6.1_solid-js@1.7.3 '@kobalte/vanilla-extract': 0.3.0_sj7ql4kjoy7ivqenazaubmmhp4 @@ -2457,19 +2455,6 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 - /@kobalte/core/0.8.2_solid-js@1.6.15: - resolution: {integrity: sha512-EoBYKpYa3+Csr5Zh7l3aY3yAg7fk1O3ZM9lGyD1mdQ1FutTuwTkyj8z1CvSSj1Klb+rBL+X1N662Occ8Bmsi2w==} - peerDependencies: - solid-js: ^1.6.15 - dependencies: - '@floating-ui/dom': 1.2.5 - '@internationalized/date': 3.1.0 - '@internationalized/number': 3.2.0 - '@internationalized/string': 3.1.0 - '@kobalte/utils': 0.6.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@kobalte/core/0.8.2_solid-js@1.7.3: resolution: {integrity: sha512-EoBYKpYa3+Csr5Zh7l3aY3yAg7fk1O3ZM9lGyD1mdQ1FutTuwTkyj8z1CvSSj1Klb+rBL+X1N662Occ8Bmsi2w==} peerDependencies: @@ -2483,20 +2468,6 @@ packages: solid-js: 1.7.3 dev: false - /@kobalte/utils/0.6.1_solid-js@1.6.15: - resolution: {integrity: sha512-YvBqe9t9j0iYFUHfKXSMLQKM3s5+nL72RvT9b75W+IOxUpSpN4rdaI8C2j97k3LsEt7qY4ktJdt8lPM1rr8JXw==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/event-listener': 2.2.9_solid-js@1.6.15 - '@solid-primitives/keyed': 1.1.10_solid-js@1.6.15 - '@solid-primitives/media': 2.1.5_solid-js@1.6.15 - '@solid-primitives/props': 3.1.3_solid-js@1.6.15 - '@solid-primitives/refs': 1.0.1_solid-js@1.6.15 - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@kobalte/utils/0.6.1_solid-js@1.7.3: resolution: {integrity: sha512-YvBqe9t9j0iYFUHfKXSMLQKM3s5+nL72RvT9b75W+IOxUpSpN4rdaI8C2j97k3LsEt7qY4ktJdt8lPM1rr8JXw==} peerDependencies: @@ -2574,19 +2545,6 @@ packages: tslib: 2.5.0 dev: false - /@motionone/solid/10.16.0_solid-js@1.6.15: - resolution: {integrity: sha512-pxE5qQEtwv42bAllHFVapZevX5T4YTYzFe7vo0+Lljqyx+7+jP1NT0fosBUAOhDNdJNANNMldXwyh+qGBW5BrA==} - peerDependencies: - solid-js: ^1.5.0 - dependencies: - '@motionone/dom': 10.15.5 - '@motionone/utils': 10.15.1 - '@solid-primitives/props': 3.1.3_solid-js@1.6.15 - '@solid-primitives/refs': 1.0.1_solid-js@1.6.15 - '@solid-primitives/transition-group': 1.0.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@motionone/solid/10.16.0_solid-js@1.7.3: resolution: {integrity: sha512-pxE5qQEtwv42bAllHFVapZevX5T4YTYzFe7vo0+Lljqyx+7+jP1NT0fosBUAOhDNdJNANNMldXwyh+qGBW5BrA==} peerDependencies: @@ -2879,15 +2837,6 @@ packages: '@sinonjs/commons': 1.8.6 dev: true - /@solid-primitives/event-listener/2.2.9_solid-js@1.6.15: - resolution: {integrity: sha512-8HdsLig2P+X9McW4b6f42sZrJGnkq8nlXm3TiIx7vyS3c9r0j8VH/6x85NTixXfx7fr7KkrWfW7MqCiJkWVXLg==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@solid-primitives/event-listener/2.2.9_solid-js@1.7.3: resolution: {integrity: sha512-8HdsLig2P+X9McW4b6f42sZrJGnkq8nlXm3TiIx7vyS3c9r0j8VH/6x85NTixXfx7fr7KkrWfW7MqCiJkWVXLg==} peerDependencies: @@ -2897,14 +2846,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/keyed/1.1.10_solid-js@1.6.15: - resolution: {integrity: sha512-J3TI4hL+C5Btc078BvlebUbUf0GQP3b/1fGfBHzfdgK32dTBsZsxCk/qU1IP03b6VJFkNteeVhK9pPeUARk80g==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - solid-js: 1.6.15 - dev: false - /@solid-primitives/keyed/1.1.10_solid-js@1.7.3: resolution: {integrity: sha512-J3TI4hL+C5Btc078BvlebUbUf0GQP3b/1fGfBHzfdgK32dTBsZsxCk/qU1IP03b6VJFkNteeVhK9pPeUARk80g==} peerDependencies: @@ -2913,17 +2854,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/media/2.1.5_solid-js@1.6.15: - resolution: {integrity: sha512-2Aa17jiulT1GvYZLMbwgJJsheZAjrrc80C9w0SJ2pFRN6Kyo0ygFwPxblYafyVLLq0siYa5Ug45fQs2TM/sNyw==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/event-listener': 2.2.9_solid-js@1.6.15 - '@solid-primitives/rootless': 1.3.1_solid-js@1.6.15 - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@solid-primitives/media/2.1.5_solid-js@1.7.3: resolution: {integrity: sha512-2Aa17jiulT1GvYZLMbwgJJsheZAjrrc80C9w0SJ2pFRN6Kyo0ygFwPxblYafyVLLq0siYa5Ug45fQs2TM/sNyw==} peerDependencies: @@ -2935,15 +2865,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/props/3.1.3_solid-js@1.6.15: - resolution: {integrity: sha512-a1YwUjWJvjPDaekpsSD8dna98XVW08lt8hzqWjOBdJJdEN2boilC0GQSTPYI9aIHxF2u9SNIavikcDHwWLk3Fg==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@solid-primitives/props/3.1.3_solid-js@1.7.3: resolution: {integrity: sha512-a1YwUjWJvjPDaekpsSD8dna98XVW08lt8hzqWjOBdJJdEN2boilC0GQSTPYI9aIHxF2u9SNIavikcDHwWLk3Fg==} peerDependencies: @@ -2953,15 +2874,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/refs/1.0.1_solid-js@1.6.15: - resolution: {integrity: sha512-1DYJCbAYVr1qGtKhexxYt0IA4VKgQFmgO6pSqW98p6XwNO2kqJwKb6wVMBSCggLdresE0mqBSTyYPPIE1sxMJQ==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@solid-primitives/refs/1.0.1_solid-js@1.7.3: resolution: {integrity: sha512-1DYJCbAYVr1qGtKhexxYt0IA4VKgQFmgO6pSqW98p6XwNO2kqJwKb6wVMBSCggLdresE0mqBSTyYPPIE1sxMJQ==} peerDependencies: @@ -2971,15 +2883,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/rootless/1.3.1_solid-js@1.6.15: - resolution: {integrity: sha512-YsMRXs7N6qMJlakSIq/vuQvhlqLblVXGprhKm7rAsVPuj3cLH5elVxAguouWdBWPoXuhZ3ua8a2o6RYmxQSKcg==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - '@solid-primitives/utils': 5.5.1_solid-js@1.6.15 - solid-js: 1.6.15 - dev: false - /@solid-primitives/rootless/1.3.1_solid-js@1.7.3: resolution: {integrity: sha512-YsMRXs7N6qMJlakSIq/vuQvhlqLblVXGprhKm7rAsVPuj3cLH5elVxAguouWdBWPoXuhZ3ua8a2o6RYmxQSKcg==} peerDependencies: @@ -2989,14 +2892,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/transition-group/1.0.1_solid-js@1.6.15: - resolution: {integrity: sha512-StVQs7BVGQa1uo6dD19wqOgfGMxu3gL/bvPHUV/NBJaiNX5R5e7dPb6lz6zR1RdTho3M+3Mv8jUHKd/aKuhL4w==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - solid-js: 1.6.15 - dev: false - /@solid-primitives/transition-group/1.0.1_solid-js@1.7.3: resolution: {integrity: sha512-StVQs7BVGQa1uo6dD19wqOgfGMxu3gL/bvPHUV/NBJaiNX5R5e7dPb6lz6zR1RdTho3M+3Mv8jUHKd/aKuhL4w==} peerDependencies: @@ -3005,14 +2900,6 @@ packages: solid-js: 1.7.3 dev: false - /@solid-primitives/utils/5.5.1_solid-js@1.6.15: - resolution: {integrity: sha512-1XuBTFD66SxhBRRHeNOs8mDmYV7+3vEm+QZFBlUbwevuOOaQ7C06bYsaEUz8KtOhFLjTjpIUwWRdwkoB5fPs8A==} - peerDependencies: - solid-js: ^1.6.12 - dependencies: - solid-js: 1.6.15 - dev: false - /@solid-primitives/utils/5.5.1_solid-js@1.7.3: resolution: {integrity: sha512-1XuBTFD66SxhBRRHeNOs8mDmYV7+3vEm+QZFBlUbwevuOOaQ7C06bYsaEUz8KtOhFLjTjpIUwWRdwkoB5fPs8A==} peerDependencies: @@ -7910,11 +7797,6 @@ packages: smart-buffer: 4.2.0 dev: true - /solid-js/1.6.15: - resolution: {integrity: sha512-xEuMUIdDf4YRFT4i3XEJCNg4Y21lZiWWPSEqj0R3UnLLpENGJVXkqpmbIyRU5CuMImKPIEu5CYgmFKL7Npfe1A==} - dependencies: - csstype: 3.1.1 - /solid-js/1.7.3: resolution: {integrity: sha512-4hwaF/zV/xbNeBBIYDyu3dcReOZBECbO//mrra6GqOrKy4Soyo+fnKjpZSa0nODm6j1aL0iQRh/7ofYowH+jzw==} dependencies: @@ -7932,7 +7814,7 @@ packages: solid-js: 1.7.3 dev: true - /solid-testing-library/0.3.0_solid-js@1.6.15: + /solid-testing-library/0.3.0_solid-js@1.7.3: resolution: {integrity: sha512-6NWVbySNVzyReBm2N6p3eF8bzxRZXHZTAmPix4vFWYol16QWVjNQsEUxvr+ZOutb0yuMZmNuGx3b6WIJYmjwMQ==} engines: {node: '>= 14'} deprecated: This package is now available at @solidjs/testing-library @@ -7940,7 +7822,7 @@ packages: solid-js: '>=1.0.0' dependencies: '@testing-library/dom': 7.31.2 - solid-js: 1.6.15 + solid-js: 1.7.3 dev: true /solid-testing-library/0.5.1_solid-js@1.7.3: @@ -8029,7 +7911,7 @@ packages: optional: true dependencies: rxjs: 7.8.0 - solid-js: 1.6.15 + solid-js: 1.7.3 dev: false /stop-iteration-iterator/1.0.0: diff --git a/tsconfig.json b/tsconfig.json index 38a38a0..3c1c95b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,6 +30,11 @@ "jest", "@testing-library/jest-dom" ], + "paths": { + "@codeui/kit": [ + "./packages/kit/src/index.tsx" + ] + } }, "exclude": [ "node_modules"