Merge branch 'umbraco:main' into fix-issue-700

Author: jonnymuir

.github/workflows/azure-static-web-apps-delightful-beach-055ecb503.yml

@@ -4,19 +4,13 @@ on:
   push:
     branches:
       - main
-      - 'v*/main'
-      - 'v*/dev'
-      - 'v*/contrib'
-      - 'release/*'
+      - production
   # This is how azure builds staging environments
   pull_request:
     types: [opened, synchronize, reopened, closed]
     branches:
       - main
-      - 'v*/main'
-      - 'v*/dev'
-      - 'v*/contrib'
-      - 'release/*'
+      - production
 
 env:
   NODE_OPTIONS: --max_old_space_size=16384
@@ -28,8 +22,16 @@ jobs:
     name: Build and Deploy Job
     steps:
       - uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          submodules: true
+          node-version-file: .nvmrc
+          check-latest: true
+          cache: 'npm'
+
+      - name: Install Dependencies
+        run: npm install
 
       - name: Build And Deploy
         id: builddeploy
@@ -44,7 +46,7 @@ jobs:
           app_build_command: 'npm run storybook:build'
           api_location: '' # Api source code path - optional
           output_location: '/storybook-static' # Built app content directory - optional
-          production_branch: 'v1/main' # Production branch
+          production_branch: 'production' # Production branch
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:

.github/workflows/chromatic.yml

@@ -16,12 +16,8 @@ on:
       - 'packages/*/lib/**'
       - 'packages/*/assets/**'
     branches-ignore:
-      - 'dependabot/**'
       - 'release/*'
-      - 'Release/*'
-      - 'main'
-      - 'v*/main'
-      - 'v*/release'
+      - 'production'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -66,6 +62,6 @@ jobs:
           exitOnceUploaded: true
           onlyChanged: true,
           untraced: '.storybook/images/**/*,storyhelpers/**/*'
-          autoAcceptChanges: 'v*/contrib'
+          autoAcceptChanges: 'main'
           externals: |
             .storybook/images/**

.github/workflows/codeql-analysis.yml

@@ -4,17 +4,11 @@ on:
   push:
     branches:
       - main
-      - dev
-      - 'v*/dev'
-      - 'v*/main'
-      - 'v*/contrib'
       - 'release/*'
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-      - dev
-      - 'v*/dev'
-      - 'v*/contrib'
+      - main
       - 'release/*'
   schedule:
     - cron: '39 20 * * 3'

.github/workflows/publish.yml

@@ -3,18 +3,10 @@ name: Publish
 on:
   push:
     branches:
-      - main
-      - 'v*/main'
+      - production
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-    inputs:
-      sha:
-        description: The commit hash referring to the commit to check.
-        required: false
-      ref:
-        description: The head branch associated with the pull request.
-        required: false
 
 env:
   NODE_OPTIONS: --max_old_space_size=16384

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ on:
   # Triggers the workflow on push or pull request events but only for the dev branch
   pull_request:
     branches-ignore:
-      - 'v*/main'
+      - production
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.storybook/main.ts

@@ -33,8 +33,6 @@ const config: StorybookConfig = {
     options: {},
   },
 
-  docs: {
-    autodocs: true,
-  },
+  docs: {},
 };
 export default config;

CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.14.0-rc.2](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.1...v1.14.0-rc.2) (2025-05-26)
+
+### Bug Fixes
+
+- replaces all color() variables with their true value ([cd6a4a5](https://github.com/umbraco/Umbraco.UI/commit/cd6a4a5337b918e1858919a31772694da31cdb0d))
+
+# [1.14.0-rc.1](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.0...v1.14.0-rc.1) (2025-05-23)
+
+**Note:** Version bump only for package uui-monorepo
+
+# [1.14.0-rc.0](https://github.com/umbraco/Umbraco.UI/compare/v1.13.0...v1.14.0-rc.0) (2025-05-16)
+
+### Bug Fixes
+
+- color picker dark theme ([#1057](https://github.com/umbraco/Umbraco.UI/issues/1057)) ([415ff32](https://github.com/umbraco/Umbraco.UI/commit/415ff322fc2524a4167d75f0689343bed5f49bc2))
+- Gave host "color" to make sure things like text in date picker are aligned with theme, as well as giving it a a color scheme option ([#1056](https://github.com/umbraco/Umbraco.UI/issues/1056)) ([49534c1](https://github.com/umbraco/Umbraco.UI/commit/49534c1517197ebc176f53d2d65907c38a8b3295))
+- selection on click in color area ([#1075](https://github.com/umbraco/Umbraco.UI/issues/1075)) ([517788b](https://github.com/umbraco/Umbraco.UI/commit/517788b976de37852fe5d4e111f63a460570b5d8))
+- Text character length validation should be more helpful ([#1060](https://github.com/umbraco/Umbraco.UI/issues/1060)) ([12cc5bc](https://github.com/umbraco/Umbraco.UI/commit/12cc5bcb2ab8c9b925bd811db0b25848df899a56))
+- typo in comment ([#1084](https://github.com/umbraco/Umbraco.UI/issues/1084)) ([b1751f0](https://github.com/umbraco/Umbraco.UI/commit/b1751f020743f644f6a9b730851574e62bc906b0))
+- **uui-color-picker:** alpha should default to 100 if there is no color string ([#1061](https://github.com/umbraco/Umbraco.UI/issues/1061)) ([dc445f3](https://github.com/umbraco/Umbraco.UI/commit/dc445f3de303d8b529759dedb9231e23e091efbf))
+
+### Features
+
+- adds an "initials" property ([601797f](https://github.com/umbraco/Umbraco.UI/commit/601797f03a469baa9e72b95363e916fade8561ee))
+- adds localization to uui-pagination ([#1069](https://github.com/umbraco/Umbraco.UI/issues/1069)) ([4c3bbfa](https://github.com/umbraco/Umbraco.UI/commit/4c3bbfa656678edc8adb2f82ee606fbc41ef1b0b))
+- Advanced color slider story ([#1076](https://github.com/umbraco/Umbraco.UI/issues/1076)) ([5a14b6a](https://github.com/umbraco/Umbraco.UI/commit/5a14b6a70781ee26628b1ff91320ef9f276d4cc0))
+- Allow color gradient in color swatch ([#1074](https://github.com/umbraco/Umbraco.UI/issues/1074)) ([df8b8b0](https://github.com/umbraco/Umbraco.UI/commit/df8b8b072374c46ca5485d18d307f133129e2a07))
+- Specific input mode similar to input type ([#1021](https://github.com/umbraco/Umbraco.UI/issues/1021)) ([f18414d](https://github.com/umbraco/Umbraco.UI/commit/f18414d12bbed4618bbb8b11eedd926c9ff27bf5))
+
 # [1.13.0](https://github.com/umbraco/Umbraco.UI/compare/v1.13.0-rc.2...v1.13.0) (2025-03-26)
 
 ### Bug Fixes

README.md

@@ -144,5 +144,5 @@ See the rest of [the scripts here](docs/SCRIPTS.md).
 - 📥 Pull requests and 🌟 Stars are always welcome.
 - Read our [contributing guide](docs/CONTRIBUTING.md) to get started.
 - Please report bugs and feature requests in the [issue tracker](https://github.com/umbraco/Umbraco.UI/issues)
-- The main branch is the latest development branch. Please make your pull requests against this branch: `v1/contrib`
-  - You can see the latest features in the Storybook attached to this branch: [v1/contrib](https://delightful-beach-055ecb503-v1contrib.westeurope.azurestaticapps.net/)
+- The main branch is the latest development branch. Please make your pull requests against this branch: `main`
+  - You can see the latest features in the Storybook attached to this branch: [main](https://delightful-beach-055ecb503-main.westeurope.azurestaticapps.net/)

docs/RELEASE_INSTRUCTION.md

@@ -2,23 +2,23 @@
 
 1. Create a new branch for the release. We need a good naming convention: `release/<Version>` (example: `release/1.12.0`).
 1. Review new release PR (either [on GitHub](https://github.com/umbraco/Umbraco.UI/compare/)).
-1. Make a PR from the new branch to the `main` branch.
 1. Run `npm run lerna:version` and Lerna will suggest a version bump for each package.
 1. Review the new version numbers and accept with `y` and Lerna will now bump each package and update the local CHANGELOG.md file using descriptions from the conventional commits, Lerna will also reinstall NPM and generate a new lockfile.
    1. We are continuously improving the way Lerna detects changes, so you may run into packages being bumped and you do not know why. It is okay to publish a package that has not been changed in order not to mess too much with the logic that Lerna uses to detect changes.
 1. Push all the changes to your release branch.
-1. Make a PR from the new branch to the `main` branch.
+1. Make a PR from the new branch to the `production` branch.
 1. Add the `ignore-for-release`-label to the PR.
 1. Wait for GitHub checks to pass.
 1. Github will post a comment with a test link to try out that the release works in Storybook. Please check that it works.
-1. Merge PR into main **using the Merge strategy** (very important so the history is not mangled) - this will trigger two actions - `Publish`, and `Azure Static Web Apps CI/CD`. The `Publish` workflow is responsible for publishing packages to NPM. It will only publish the packages that have higher version that previously published ones. The azure workflow will build and publish UI library Storybook.
-1. Merge the `v1/main` branch with the `v1/contrib` branch by writing `git merge origin/main` and then push the changes.
+1. Merge PR into production **using the Merge strategy** (very important so the history is not mangled) - this will trigger two actions - `Publish`, and `Azure Static Web Apps CI/CD`. The `Publish` workflow is responsible for publishing packages to NPM. It will only publish the packages that have higher version that previously published ones. The azure workflow will build and publish UI library Storybook.
+1. Merge the `production` back into the `main` branch by writing `git merge origin/production` when on the `main` branch, and then push the changes. (This way we ensure that the `main` branch is always up to date with the latest release and accompanying release notes).
 1. Go to Github and [create a new release](https://github.com/umbraco/Umbraco.UI/releases/new).
    1. Using tags on the release, we want to target `vx.x.x` where "x.x.x" is the version number that the UUI package was bumped to during the release.
    1. Select the prevous version, in relation to your release, in `Previous tag` and press `Generate release notes`.
    1. Check the generated release notes, see if PRs are in the right category, if not append labels to them and return to generate again.
 1. The UI Library has now been updated.
-1. Write an post on the UI Library Slack Channel evt. update Backoffice.
+1. Write an post on the UI Library Slack Channel.
+1. Consider when to update the Backoffice.
 
 ## How to clear tags
 

lerna.json

@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
   "packages": ["packages/*"],
-  "version": "1.13.0",
+  "version": "1.14.0-rc.2",
   "preid": "rc",
   "exact": true,
   "noPush": true,