chore: merge main and solid2 (major conflicts)

.github/workflows/build.yml

@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - main
+      # - solid2 # enable later
   push:
     branches:
       - main
+      # - solid2 # enable later
 
 jobs:
   build:
@@ -20,10 +22,10 @@ jobs:
 
       - uses: pnpm/action-setup@v4
 
-      - name: Setup Node.js 21.6.1
-        uses: actions/setup-node@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
         with:
-          node-version: 21.6.1
+          node-version: "24"
           cache: pnpm
 
       - name: Install dependencies

.github/workflows/format-files-prettier.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - solid2
     paths:
       - "**.md"
       - "**.mdx"
@@ -15,6 +16,7 @@ on:
   push:
     branches:
       - main
+      - solid2
 
 jobs:
   prettier:

.github/workflows/format-files.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - solid2
     paths:
       - "**.js"
       - "**.jsx"
@@ -14,6 +15,7 @@ on:
   push:
     branches:
       - main
+      - solid2
 
 jobs:
   biome:
@@ -24,8 +26,6 @@ jobs:
 
       - name: Setup Biome
         uses: biomejs/setup-biome@v2
-        with:
-          version: 1.8.1
 
       - name: Run Biome
         run: biome ci .

.github/workflows/jsr-ci.yml

@@ -0,0 +1,47 @@
+name: JSR validation
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  jsr:
+    name: Validate JSR workspace
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: pnpm
+
+      - name: Set up Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Check deno.jsonc/package.json version and exports sync
+        run: pnpm jsr:sync:check
+
+      - name: Build libraries
+        run: pnpm build:libs
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
+
+      - name: Publish dry run with full type checks
+        run: deno publish --dry-run --allow-slow-types

.github/workflows/jsr-publish.yml

@@ -0,0 +1,57 @@
+name: Publish JSR
+
+on:
+  workflow_dispatch:
+    inputs:
+      publish:
+        description: Run the real JSR publish after the dry run passes
+        required: true
+        default: "false"
+        type: choice
+        options:
+          - "false"
+          - "true"
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  publish:
+    name: Publish JSR workspace
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: pnpm
+
+      - name: Set up Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Sync deno.jsonc versions and exports from package.json
+        run: pnpm jsr:sync
+
+      - name: Build libraries
+        run: pnpm build:libs
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
+
+      - name: Publish dry run
+        run: deno publish --dry-run --allow-slow-types
+
+      - name: Publish to JSR
+        if: ${{ inputs.publish == 'true' }}
+        run: deno publish --allow-slow-types

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on: [workflow_dispatch]
 
 permissions:
   id-token: write
-  contents: read
+  contents: write
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 

.github/workflows/test.yml

@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - main
+      - solid2
   push:
     branches:
       - main
+      - solid2
 
 jobs:
   build:
@@ -20,10 +22,10 @@ jobs:
 
       - uses: pnpm/action-setup@v4
 
-      - name: Setup Node.js 21.6.1
-        uses: actions/setup-node@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
         with:
-          node-version: 21.6.1
+          node-version: "24"
           cache: pnpm
 
       - name: Install dependencies

.github/workflows/version.yml

@@ -16,10 +16,10 @@ jobs:
 
       - uses: pnpm/action-setup@v4
 
-      - name: Setup Node.js 21.6.1
-        uses: actions/setup-node@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
         with:
-          node-version: 21.6.1
+          node-version: "24"
           cache: pnpm
 
       - name: Install Dependencies

.gitignore

@@ -18,9 +18,6 @@ lerna-debug.log
 .env.test.local
 .env.production.local
 
-# turbo
-.turbo
-
 # solid
 .solid
 .vinxi

.prettierignore

@@ -3,5 +3,8 @@
 *.jsx
 *.tsx
 *.json
+*.jsonc
 *.cjs
-pnpm-lock.yaml
+*.mjs
+*.css
+pnpm-lock.yaml

.storybook/main.ts

@@ -79,7 +79,13 @@ const config: StorybookConfig = {
 						).pathname,
 					},
 				],
-				dedupe: ["react", "react-dom", "solid-js", "@solidjs/signals", "@solidjs/web"],
+				dedupe: [
+					"react",
+					"react-dom",
+					"solid-js",
+					"@solidjs/signals",
+					"@solidjs/web",
+				],
 			},
 		});
 	},

.storybook/manager.ts

@@ -3,9 +3,9 @@ import { create } from "storybook/theming/create";
 
 addons.setConfig({
 	theme: create({
-		base: "light",
+		base: "dark",
 		brandTitle: "Kobalte",
-		brandImage: "/kobalte-logo.svg",
+		brandImage: "/kobalte.svg",
 		brandUrl: "https://kobalte.dev",
 		brandTarget: "_blank",
 	}),