Skip to content

Commit ce9a4d1

Browse files
committed
Merge branch 'main' into production
2 parents 78b0a78 + 9296dba commit ce9a4d1

File tree

213 files changed

+6105
-6426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+6105
-6426
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,27 @@ on:
1313
- main
1414
- production
1515
- 'release/*'
16-
- '!dependabot/**'
1716

1817
env:
1918
NODE_OPTIONS: --max_old_space_size=16384
2019

2120
jobs:
2221
build_and_deploy_job:
23-
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
22+
if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed'))
2423
runs-on: ubuntu-latest
2524
name: Build and Deploy Job
2625
steps:
2726
- uses: actions/checkout@v4
27+
28+
- name: Use Node.js
29+
uses: actions/setup-node@v4
2830
with:
29-
submodules: true
31+
node-version-file: .nvmrc
32+
check-latest: true
33+
cache: 'npm'
34+
35+
- name: Install Dependencies
36+
run: npm install
3037

3138
- name: Build And Deploy
3239
id: builddeploy

.github/workflows/chromatic.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@ jobs:
4444
with:
4545
# pulls all commits (needed for chromatic to find baselines)
4646
fetch-depth: '0'
47-
- name: Use Node.js 20
47+
- name: Use Node.js
4848
uses: actions/setup-node@v4
4949
with:
50-
node-version: 20
50+
node-version-file: .nvmrc
51+
check-latest: true
5152
cache: 'npm'
5253
- name: Install dependencies
5354
run: npm install
5455
- name: Publish to Chromatic
55-
uses: chromaui/action@v11
56+
uses: chromaui/action@latest
5657
continue-on-error: true
5758
with:
5859
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ jobs:
3737
restore-keys: |
3838
${{ runner.os }}-cache-
3939
40-
- name: Use Node.js 20
40+
- name: Use Node.js
4141
uses: actions/setup-node@v4
4242
with:
43-
node-version: 20
43+
node-version-file: .nvmrc
44+
check-latest: true
4445
cache: 'npm'
4546

4647
- run: npm -v

.github/workflows/tests.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ env:
1717
jobs:
1818
test:
1919
runs-on: ubuntu-latest
20-
21-
strategy:
22-
matrix:
23-
node-version: [20]
24-
2520
steps:
2621
- uses: actions/checkout@v4
27-
- name: Use Node.js ${{ matrix.node-version }}
22+
- name: Use Node.js
2823
uses: actions/setup-node@v4
2924
with:
30-
node-version: ${{ matrix.node-version }}
25+
node-version-file: .nvmrc
26+
check-latest: true
3127
cache: 'npm'
3228
- run: npm install
3329
- run: npm run lint
@@ -37,11 +33,6 @@ jobs:
3733

3834
build:
3935
runs-on: ubuntu-latest
40-
41-
strategy:
42-
matrix:
43-
node-version: [20]
44-
4536
steps:
4637
- uses: actions/checkout@v4
4738
- name: Cache build setup
@@ -51,10 +42,11 @@ jobs:
5142
key: ${{ runner.os }}-cache-${{ github.sha }}
5243
restore-keys: |
5344
${{ runner.os }}-cache-
54-
- name: Use Node.js ${{ matrix.node-version }}
45+
- name: Use Node.js
5546
uses: actions/setup-node@v4
5647
with:
57-
node-version: ${{ matrix.node-version }}
48+
node-version-file: .nvmrc
49+
check-latest: true
5850
cache: 'npm'
5951
- run: npm install
6052
- run: npm run build:prod

.storybook/main.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
import type { StorybookConfig } from '@storybook/web-components-vite';
2-
import { join, dirname } from 'path';
3-
4-
/**
5-
* This function is used to resolve the absolute path of a package.
6-
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
7-
*/
8-
function getAbsolutePath(value: string): any {
9-
return dirname(require.resolve(join(value, 'package.json')));
10-
}
2+
import remarkGfm from 'remark-gfm';
113

124
const config: StorybookConfig = {
135
stories: [
@@ -19,15 +11,25 @@ const config: StorybookConfig = {
1911
staticDirs: ['./images'],
2012

2113
addons: [
22-
getAbsolutePath('@storybook/addon-links'),
23-
getAbsolutePath('@storybook/addon-essentials'),
24-
getAbsolutePath('@chromatic-com/storybook'),
25-
getAbsolutePath('@storybook/addon-a11y'),
14+
{
15+
name: '@storybook/addon-docs',
16+
options: {
17+
mdxPluginOptions: {
18+
mdxCompileOptions: {
19+
remarkPlugins: [remarkGfm],
20+
},
21+
},
22+
},
23+
},
24+
'@storybook/addon-links',
25+
'@storybook/addon-essentials',
26+
'@chromatic-com/storybook',
27+
'@storybook/addon-a11y',
2628
'../storyhelpers/storybook-readme',
2729
],
2830

2931
framework: {
30-
name: getAbsolutePath('@storybook/web-components-vite'),
32+
name: '@storybook/web-components-vite',
3133
options: {},
3234
},
3335

.storybook/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
setCustomElementsManifest,
33
type Preview,
44
} from '@storybook/web-components';
5-
import '../packages/uui-css/lib/uui-css.css';
5+
import '../packages/uui-css/dist/uui-css.css';
66
import customElements from '../custom-elements.json';
77
import { html } from 'lit';
88

CHANGELOG.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,53 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.14.0](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.4...v1.14.0) (2025-06-11)
7+
8+
### Bug Fixes
9+
10+
- line-height set to 1 on uui-button ([#1114](https://github.com/umbraco/Umbraco.UI/issues/1114)) ([9c528f0](https://github.com/umbraco/Umbraco.UI/commit/9c528f004686924ad9874c3b4f429c9c1a3126c4))
11+
12+
# [1.14.0-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
13+
14+
### Bug Fixes
15+
16+
- installs postcss-import and postcss-url to ensure asset paths are correct ([04e5033](https://github.com/umbraco/Umbraco.UI/commit/04e503310b3a95043bd7df22395e4bdbc70b106c))
17+
18+
# [1.14.0-rc.3](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.2...v1.14.0-rc.3) (2025-05-28)
19+
20+
### Bug Fixes
21+
22+
- Set height for input prepend/append slots ([#1113](https://github.com/umbraco/Umbraco.UI/issues/1113)) ([0681615](https://github.com/umbraco/Umbraco.UI/commit/0681615c576dcf4e1095b1334caf48c21d29edba))
23+
24+
# [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)
25+
26+
### Bug Fixes
27+
28+
- replaces all color() variables with their true value ([cd6a4a5](https://github.com/umbraco/Umbraco.UI/commit/cd6a4a5337b918e1858919a31772694da31cdb0d))
29+
30+
# [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)
31+
32+
**Note:** Version bump only for package uui-monorepo
33+
34+
# [1.14.0-rc.0](https://github.com/umbraco/Umbraco.UI/compare/v1.13.0...v1.14.0-rc.0) (2025-05-16)
35+
36+
### Bug Fixes
37+
38+
- color picker dark theme ([#1057](https://github.com/umbraco/Umbraco.UI/issues/1057)) ([415ff32](https://github.com/umbraco/Umbraco.UI/commit/415ff322fc2524a4167d75f0689343bed5f49bc2))
39+
- 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))
40+
- selection on click in color area ([#1075](https://github.com/umbraco/Umbraco.UI/issues/1075)) ([517788b](https://github.com/umbraco/Umbraco.UI/commit/517788b976de37852fe5d4e111f63a460570b5d8))
41+
- 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))
42+
- typo in comment ([#1084](https://github.com/umbraco/Umbraco.UI/issues/1084)) ([b1751f0](https://github.com/umbraco/Umbraco.UI/commit/b1751f020743f644f6a9b730851574e62bc906b0))
43+
- **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))
44+
45+
### Features
46+
47+
- adds an "initials" property ([601797f](https://github.com/umbraco/Umbraco.UI/commit/601797f03a469baa9e72b95363e916fade8561ee))
48+
- adds localization to uui-pagination ([#1069](https://github.com/umbraco/Umbraco.UI/issues/1069)) ([4c3bbfa](https://github.com/umbraco/Umbraco.UI/commit/4c3bbfa656678edc8adb2f82ee606fbc41ef1b0b))
49+
- Advanced color slider story ([#1076](https://github.com/umbraco/Umbraco.UI/issues/1076)) ([5a14b6a](https://github.com/umbraco/Umbraco.UI/commit/5a14b6a70781ee26628b1ff91320ef9f276d4cc0))
50+
- Allow color gradient in color swatch ([#1074](https://github.com/umbraco/Umbraco.UI/issues/1074)) ([df8b8b0](https://github.com/umbraco/Umbraco.UI/commit/df8b8b072374c46ca5485d18d307f133129e2a07))
51+
- 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))
52+
653
# [1.13.0](https://github.com/umbraco/Umbraco.UI/compare/v1.13.0-rc.2...v1.13.0) (2025-03-26)
754

855
### Bug Fixes

eslint.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import globals from 'globals';
22
import pluginJs from '@eslint/js';
33
import tseslint from 'typescript-eslint';
44
import localRules from 'eslint-plugin-local-rules';
5-
import wcPlugin from 'eslint-plugin-wc';
6-
import litPlugin from 'eslint-plugin-lit';
5+
import * as wcPlugin from 'eslint-plugin-wc';
6+
import * as litPlugin from 'eslint-plugin-lit';
77
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
88

99
import { includeIgnoreFile } from '@eslint/compat';

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
33
"packages": ["packages/*"],
4-
"version": "1.13.0",
4+
"version": "1.14.0",
55
"preid": "rc",
66
"exact": true,
77
"noPush": true,

0 commit comments

Comments
 (0)