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:

.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

@@ -10,16 +10,14 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log
+.claude
 
 # local env files
 .env.local
 .env.development.local
 .env.test.local
 .env.production.local
 
-# turbo
-.turbo
-
 # solid
 .solid
 .vinxi
@@ -43,3 +41,4 @@ packages/core/NOTICE.txt
 .DS_Store
 Thumbs.db
 .vercel
+/storybook-static

.storybook/globals.css

@@ -0,0 +1,2 @@
+@source "./.storybook/**/*.{ts,tsx}";
+@source "./packages/core/src/**/*.{ts,tsx}";

.storybook/main.ts

@@ -0,0 +1,88 @@
+import type { StorybookConfig } from "storybook-solidjs-vite";
+import { mergeConfig } from "vite";
+
+const config: StorybookConfig = {
+	stories: ["../packages/core/src/**/stories/*.stories.{ts,tsx}"],
+	staticDirs: ["./public"],
+	addons: ["@storybook/addon-docs"],
+	framework: {
+		name: "storybook-solidjs-vite",
+		// docgen: false — storybook-solidjs-vite@10.5.2 bug: dynamic import('typescript')
+		// returns { default: ts } in ESM context so ts.sys is undefined inside the plugin
+		options: { docgen: false },
+	},
+	docs: {},
+	async viteFinal(config) {
+		return mergeConfig(config, {
+			plugins: [
+				{
+					name: "solid-addEventListener-compat",
+					transform(code: string, id: string) {
+						if (
+							/\.(tsx?|jsx?)$/.test(id) &&
+							code.includes("addEventListener as _$addEventListener")
+						) {
+							return {
+								code: code.replace(
+									/\{ addEventListener as _\$addEventListener \}/g,
+									"{ addEvent as _$addEventListener }",
+								),
+								map: null,
+							};
+						}
+					},
+				},
+				// Intercept any file that imports the removed `on` helper from solid-js.
+				// Logs the filename so we can find the culprit, and replaces the import
+				// with a shim so rendering continues.
+				{
+					name: "solid-on-shim",
+					transform(code: string, id: string) {
+						if (
+							code.includes("from 'solid-js'") ||
+							code.includes('from "solid-js"')
+						) {
+							if (/\bon\b/.test(code)) {
+								const hasOnImport =
+									/import\s*\{[^}]*\bon\b[^}]*\}\s*from\s*['"]solid-js['"]/.test(
+										code,
+									);
+								if (hasOnImport) {
+									console.warn(
+										`[solid-on-shim] Found legacy 'on' import in: ${id}`,
+									);
+									// Remove 'on' from the import and inject a no-op shim after the import
+									const patched = code
+										.replace(/,\s*\bon\b/g, "")
+										.replace(/\bon\b\s*,/g, "")
+										.replace(/\{\s*\bon\b\s*\}/g, "{ createEffect }");
+									return {
+										code:
+											patched +
+											"\nconst on = (deps, fn) => { createEffect(deps, fn); };\n",
+										map: null,
+									};
+								}
+							}
+						}
+					},
+				},
+			],
+			resolve: {
+				alias: [
+					{ find: "solid-js/web", replacement: "@solidjs/web" },
+					{
+						find: "@kobalte/utils",
+						replacement: new URL(
+							"../packages/utils/src/index.ts",
+							import.meta.url,
+						).pathname,
+					},
+				],
+				dedupe: ["react", "react-dom", "solid-js", "@solidjs/signals", "@solidjs/web"],
+			},
+		});
+	},
+};
+
+export default config;

.storybook/manager.ts

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

.storybook/preview.ts

@@ -0,0 +1,8 @@
+import * as docsAnnotations from "@storybook/addon-docs/preview";
+import { definePreview } from "storybook-solidjs-vite/next";
+import "./globals.css";
+
+export default definePreview({
+	addons: [docsAnnotations],
+	parameters: { layout: "centered", docs: { toc: true } },
+});

.storybook/tsconfig.json

@@ -0,0 +1,12 @@
+{
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"module": "ESNext",
+		"moduleResolution": "Bundler",
+		"jsxImportSource": "@solidjs/web",
+		"customConditions": ["@solid-primitives/source"],
+		"verbatimModuleSyntax": false,
+		"types": ["vite/client"]
+	},
+	"include": ["./**/*", "../packages/core/src/*/stories/**/*"]
+}