Merge branch 'master' into asset-validation-error-per-asset-6.x

Author: godismyjudge95

.github/workflows/pr-title.yml

@@ -8,6 +8,56 @@ jobs:
   pr-title:
     runs-on: ubuntu-latest
     steps:
-      - uses: deepakputhraya/action-pr-title@master
-        with:
-          regex: '^\[\d+\.x\]\s'
+      - name: Validate PR title matches target branch
+        env:
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+        run: |
+          # Validates PR title against target branch
+          # Returns error message if invalid, empty string if valid
+          validate_pr_title() {
+            local target_branch="$1"
+            local pr_title="$2"
+            local default_branch="$3"
+
+            # Check if target branch is a version branch (e.g., 5.x, 4.x)
+            if [[ $target_branch =~ ^([0-9]+)\.x$ ]]; then
+              local version="${BASH_REMATCH[1]}"
+              if [[ ! $pr_title =~ ^\[$version\.x\][[:space:]] ]]; then
+                echo "PR targeting '$target_branch' must have title starting with '[$version.x] '"
+                return
+              fi
+
+            # Check if target branch is master (next major version)
+            elif [[ $target_branch == "master" ]]; then
+              local current_version="${default_branch//\.x/}"
+              local next_version=$((current_version + 1))
+              if [[ ! $pr_title =~ ^\[$next_version\.x\][[:space:]] ]]; then
+                echo "PR targeting 'master' must have title starting with '[$next_version.x] '"
+                return
+              fi
+
+            # For other branches, just enforce that there's a version prefix
+            else
+              if [[ ! $pr_title =~ ^\[[0-9]+\.x\][[:space:]] ]]; then
+                echo "PR title must start with a version prefix like '[5.x] '"
+                return
+              fi
+            fi
+
+            echo ""
+          }
+
+          echo "PR Title: $PR_TITLE"
+          echo "Base Branch: $BASE_BRANCH"
+          echo "Default Branch: $DEFAULT_BRANCH"
+
+          ERROR=$(validate_pr_title "$BASE_BRANCH" "$PR_TITLE" "$DEFAULT_BRANCH")
+
+          if [[ -n $ERROR ]]; then
+            echo $ERROR
+            exit 1
+          fi
+
+          echo "PR title validation passed"

.github/workflows/release.yml

@@ -80,12 +80,7 @@ jobs:
           asset_name: dist-package.tar.gz
           asset_content_type: application/tar+gz
 
-      - name: Upload dist-ui zip to release
-        uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./resources/dist-ui.tar.gz
-          asset_name: dist-ui.tar.gz
-          asset_content_type: application/tar+gz
+      - name: Deploy Storybook to Forge
+        continue-on-error: true
+        run: |
+          curl -X POST "${{ secrets.FORGE_STORYBOOK_WEBHOOK }}"

.github/workflows/tests.yml

@@ -16,17 +16,13 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.2, 8.3, 8.4]
-        laravel: [11.*, 12.*]
+        php: [8.3, 8.4, 8.5]
+        laravel: [12.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
         include:
           - os: windows-latest
-            php: 8.4
-            laravel: 11.*
-            stability: prefer-stable
-          - os: windows-latest
-            php: 8.4
+            php: 8.5
             laravel: 12.*
             stability: prefer-stable
 
@@ -130,13 +126,21 @@ jobs:
         if: steps.should-run-tests.outputs.result == 'true'
         run: npm ci
 
+      - name: Install Playwright browsers
+        if: steps.should-run-tests.outputs.result == 'true'
+        run: npx playwright install chromium
+
       - name: Execute tests
         if: steps.should-run-tests.outputs.result == 'true'
         run: npm run test
         env:
           CI: true
           LARAVEL_BYPASS_ENV_CHECK: 1
 
+      - name: Verify build succeeds
+        if: steps.should-run-tests.outputs.result == 'true'
+        run: npm run build
+
   slack:
     name: Slack Notification
     runs-on: ubuntu-latest

.gitignore

@@ -11,9 +11,9 @@ resources/dist
 resources/dist-dev
 resources/dist-frontend
 resources/dist-package
-resources/dist-ui
 packages/cms/src/ui.css
 composer.lock
 .env
 bundle-stats.html
 .claude
+storybook-static

.storybook/clean-code-snippet.js

@@ -0,0 +1,29 @@
+export default function cleanCodeSnippet(code) {
+    // Extract template content from render functions or template tags
+    let cleaned = code;
+
+    // Handle render function format
+    const renderMatch = code.match(/template:\s*`([\s\S]*?)`/);
+    if (renderMatch) {
+        cleaned = renderMatch[1];
+    } else {
+        // Handle simple template format
+        cleaned = code.replace(/<template>([\s\S]*?)<\/template>/, '$1');
+    }
+
+    // Split into lines and remove common leading whitespace
+    const lines = cleaned.split('\n').filter(line => line.length > 0 || line.trim().length > 0);
+
+    // Find minimum indentation (ignoring empty lines)
+    const indents = lines
+        .filter(line => line.trim().length > 0)
+        .map(line => line.match(/^(\s*)/)?.[1].length || 0);
+
+    const minIndent = indents.length > 0 ? Math.min(...indents) : 0;
+
+    // Remove the common indentation and trim
+    return lines
+        .map(line => line.slice(minIndent))
+        .join('\n')
+        .trim();
+}

.storybook/main.ts

@@ -0,0 +1,21 @@
+import type { StorybookConfig } from '@storybook/vue3-vite';
+
+const config: StorybookConfig = {
+    stories: [
+        '../resources/js/stories/**/*.mdx',
+        '../resources/js/stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'
+    ],
+    addons: [
+        '@storybook/addon-docs',
+        '@storybook/addon-a11y'
+    ],
+    staticDirs: ['./public'],
+    framework: {
+        name: '@storybook/vue3-vite',
+        options: {
+            docgen: 'vue-component-meta'
+        }
+    },
+};
+
+export default config;

.storybook/manager-head.html

@@ -0,0 +1,3 @@
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Lexend:wght@400;500;600;700&family=Source+Code+Pro:wght@400;500&display=swap" rel="stylesheet">

.storybook/manager.css

@@ -0,0 +1,3 @@
+.sidebar-container {
+    background: linear-gradient(225deg, #e6f8ff, #f9e6ff, hsl(35deg 100% 95%)) !important;
+}

.storybook/manager.ts

@@ -0,0 +1,16 @@
+import { addons } from 'storybook/manager-api';
+import { create } from 'storybook/theming';
+import './manager.css';
+
+const theme = create({
+  base: 'light',
+  brandTitle: 'Statamic UI Components',
+  brandUrl: 'https://statamic.dev',
+  brandImage: '/logo.png',
+  fontBase: '"Lexend", sans-serif',
+  fontCode: '"Source Code Pro", monospace'
+});
+
+addons.setConfig({
+  theme,
+});

.storybook/preview-head.html

@@ -0,0 +1,7 @@
+<link rel="preconnect" href="https://use.typekit.net" crossorigin>
+<link rel="preconnect" href="https://p.typekit.net" crossorigin>
+<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css"/>
+
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Lexend:[email protected]&family=Source+Code+Pro:ital,wght@0,200..800;1,200..900&display=swap" rel="stylesheet">