Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: umbraco/Umbraco.UI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1/main
Choose a base ref
...
head repository: umbraco/Umbraco.UI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1/contrib
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Mar 14, 2025

  1. Copy the full SHA
    cb506b8 View commit details

Commits on Mar 18, 2025

  1. build: update chromatic

    iOvergaard committed Mar 18, 2025
    Copy the full SHA
    6c63d03 View commit details
  2. build(deps-dev): bump eslint from 9.7.0 to 9.22.0

    Bumps [eslint](https://github.com/eslint/eslint) from 9.7.0 to 9.22.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](eslint/eslint@v9.7.0...v9.22.0)
    
    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 18, 2025
    Copy the full SHA
    f52086f View commit details
  3. build(deps-dev): bump @types/chai from 4.3.12 to 5.2.0

    Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.3.12 to 5.2.0.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)
    
    ---
    updated-dependencies:
    - dependency-name: "@types/chai"
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 18, 2025
    Copy the full SHA
    c2c9271 View commit details
  4. build(deps-dev): bump rollup-plugin-esbuild from 6.1.1 to 6.2.1

    Bumps [rollup-plugin-esbuild](https://github.com/egoist/rollup-plugin-esbuild) from 6.1.1 to 6.2.1.
    - [Release notes](https://github.com/egoist/rollup-plugin-esbuild/releases)
    - [Changelog](https://github.com/egoist/rollup-plugin-esbuild/blob/dev/.releaserc.json)
    - [Commits](egoist/rollup-plugin-esbuild@v6.1.1...v6.2.1)
    
    ---
    updated-dependencies:
    - dependency-name: rollup-plugin-esbuild
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 18, 2025
    Copy the full SHA
    24fca88 View commit details

Commits on Mar 25, 2025

  1. build(deps-dev): bump eslint-config-prettier from 9.1.0 to 10.1.1

    Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.1.0 to 10.1.1.
    - [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
    - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
    - [Commits](prettier/eslint-config-prettier@v9.1.0...v10.1.1)
    
    ---
    updated-dependencies:
    - dependency-name: eslint-config-prettier
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 25, 2025
    Copy the full SHA
    7cf2e39 View commit details
  2. build(deps-dev): bump rollup from 4.27.2 to 4.37.0

    Bumps [rollup](https://github.com/rollup/rollup) from 4.27.2 to 4.37.0.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v4.27.2...v4.37.0)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 25, 2025
    Copy the full SHA
    ff15fc9 View commit details

Commits on Mar 26, 2025

  1. build(deps-dev): bump vite from 6.2.0 to 6.2.3

    Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.0 to 6.2.3.
    - [Release notes](https://github.com/vitejs/vite/releases)
    - [Changelog](https://github.com/vitejs/vite/blob/v6.2.3/packages/vite/CHANGELOG.md)
    - [Commits](https://github.com/vitejs/vite/commits/v6.2.3/packages/vite)
    
    ---
    updated-dependencies:
    - dependency-name: vite
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Mar 26, 2025
    Copy the full SHA
    c7eed28 View commit details
  2. Copy the full SHA
    5408f29 View commit details

Commits on Mar 31, 2025

  1. Copy the full SHA
    75ba91e View commit details

Commits on Apr 11, 2025

  1. build(deps): bump koa from 2.15.3 to 2.16.1

    Bumps [koa](https://github.com/koajs/koa) from 2.15.3 to 2.16.1.
    - [Release notes](https://github.com/koajs/koa/releases)
    - [Changelog](https://github.com/koajs/koa/blob/master/History.md)
    - [Commits](koajs/koa@2.15.3...v2.16.1)
    
    ---
    updated-dependencies:
    - dependency-name: koa
      dependency-version: 2.16.1
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    f73fd3c View commit details
  2. build(deps-dev): bump vite from 6.2.3 to 6.2.6

    Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.3 to 6.2.6.
    - [Release notes](https://github.com/vitejs/vite/releases)
    - [Changelog](https://github.com/vitejs/vite/blob/v6.2.6/packages/vite/CHANGELOG.md)
    - [Commits](https://github.com/vitejs/vite/commits/v6.2.6/packages/vite)
    
    ---
    updated-dependencies:
    - dependency-name: vite
      dependency-version: 6.2.6
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    47902f2 View commit details
  3. Copy the full SHA
    eb08d48 View commit details
  4. Merge branches 'v1/contrib' and 'v1/contrib' of github.com:umbraco/Um…

    …braco.UI into v1/contrib
    iOvergaard committed Apr 11, 2025
    Copy the full SHA
    e5413a8 View commit details
  5. Copy the full SHA
    8ce42c9 View commit details
  6. cleanup removing console.logs

    Welander1994 authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    36b28f2 View commit details
  7. build(deps-dev): bump tar-fs from 3.0.6 to 3.0.8

    Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 3.0.6 to 3.0.8.
    - [Commits](mafintosh/tar-fs@v3.0.6...v3.0.8)
    
    ---
    updated-dependencies:
    - dependency-name: tar-fs
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    c32aa90 View commit details
  8. fix: Gave host "color" to make sure things like text in date picker a…

    …re aligned with theme, as well as giving it a a color scheme option (#1056)
    
    Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
    MrHutmat and nielslyngsoe authored Apr 11, 2025
    Copy the full SHA
    49534c1 View commit details
  9. Copy the full SHA
    ffb3eb6 View commit details
  10. Copy the full SHA
    ccc2c97 View commit details
  11. build(deps-dev): bump eslint-plugin-wc from 2.1.0 to 3.0.0

    Bumps [eslint-plugin-wc](https://github.com/43081j/eslint-plugin-wc) from 2.1.0 to 3.0.0.
    - [Release notes](https://github.com/43081j/eslint-plugin-wc/releases)
    - [Changelog](https://github.com/43081j/eslint-plugin-wc/blob/master/CHANGELOG.md)
    - [Commits](43081j/eslint-plugin-wc@v2.1.0...3.0.0)
    
    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-wc
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    23dbc14 View commit details
  12. Copy the full SHA
    9fc5373 View commit details
  13. Fix issue support alternative characters in Avatar

    Lan Nguyen Thuy authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    d725691 View commit details
  14. Copy the full SHA
    601797f View commit details
  15. Copy the full SHA
    0a1539f View commit details
  16. build(deps-dev): bump postcss-custom-properties from 13.3.6 to 14.0.4

    Bumps [postcss-custom-properties](https://github.com/csstools/postcss-plugins/tree/HEAD/plugins/postcss-custom-properties) from 13.3.6 to 14.0.4.
    - [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugins/postcss-custom-properties/CHANGELOG.md)
    - [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugins/postcss-custom-properties)
    
    ---
    updated-dependencies:
    - dependency-name: postcss-custom-properties
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 11, 2025
    Copy the full SHA
    69fde71 View commit details
  17. Copy the full SHA
    be32b1c View commit details
  18. build: splits postcss into two processes because the color-function i…

    …s dependant on the other having already been processed
    iOvergaard committed Apr 11, 2025
    Copy the full SHA
    22275d2 View commit details
  19. Copy the full SHA
    23dab5e View commit details
  20. fix: color picker dark theme (#1057)

    * Removing some hard coded colors, so now they will be able to use the dark-theme as well
    
    * Removed the box-sahdow and added a border using the --uui-border-color, for the preview button
    
    ---------
    
    Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
    MrHutmat and nielslyngsoe authored Apr 11, 2025
    Copy the full SHA
    415ff32 View commit details

Commits on Apr 15, 2025

  1. build(deps-dev): bump rollup from 4.37.0 to 4.40.0

    Bumps [rollup](https://github.com/rollup/rollup) from 4.37.0 to 4.40.0.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v4.37.0...v4.40.0)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-version: 4.40.0
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Apr 15, 2025
    Copy the full SHA
    20cf55b View commit details
  2. Copy the full SHA
    d82b5e0 View commit details
Original file line number Diff line number Diff line change
@@ -17,14 +17,13 @@ on:
- 'v*/dev'
- 'v*/contrib'
- 'release/*'
- '!dependabot/**'

env:
NODE_OPTIONS: --max_old_space_size=16384

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed'))
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
10 changes: 7 additions & 3 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -48,15 +48,16 @@ jobs:
with:
# pulls all commits (needed for chromatic to find baselines)
fetch-depth: '0'
- name: Use Node.js 20
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: .nvmrc
check-latest: true
cache: 'npm'
- name: Install dependencies
run: npm install
- name: Publish to Chromatic
uses: chromaui/action@v11
uses: chromaui/action@latest
continue-on-error: true
with:
token: ${{ secrets.GITHUB_TOKEN }}
@@ -65,3 +66,6 @@ jobs:
exitOnceUploaded: true
onlyChanged: true,
untraced: '.storybook/images/**/*,storyhelpers/**/*'
autoAcceptChanges: 'v*/contrib'
externals: |
.storybook/images/**
5 changes: 3 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -45,10 +45,11 @@ jobs:
restore-keys: |
${{ runner.os }}-cache-
- name: Use Node.js 20
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: .nvmrc
check-latest: true
cache: 'npm'

- run: npm -v
20 changes: 6 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -17,17 +17,13 @@ env:
jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version-file: .nvmrc
check-latest: true
cache: 'npm'
- run: npm install
- run: npm run lint
@@ -37,11 +33,6 @@ jobs:

build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20]

steps:
- uses: actions/checkout@v4
- name: Cache build setup
@@ -51,10 +42,11 @@ jobs:
key: ${{ runner.os }}-cache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-cache-
- name: Use Node.js ${{ matrix.node-version }}
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version-file: .nvmrc
check-latest: true
cache: 'npm'
- run: npm install
- run: npm run build:prod
34 changes: 19 additions & 15 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
import type { StorybookConfig } from '@storybook/web-components-vite';
import { join, dirname } from 'path';

/**
* This function is used to resolve the absolute path of a package.
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
*/
function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, 'package.json')));
}
import remarkGfm from 'remark-gfm';

const config: StorybookConfig = {
stories: [
@@ -19,18 +11,30 @@ const config: StorybookConfig = {
staticDirs: ['./images'],

addons: [
getAbsolutePath('@storybook/addon-links'),
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@chromatic-com/storybook'),
getAbsolutePath('@storybook/addon-a11y'),
{
name: '@storybook/addon-docs',
options: {
mdxPluginOptions: {
mdxCompileOptions: {
remarkPlugins: [remarkGfm],
},
},
},
},
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-a11y',
'../storyhelpers/storybook-readme',
],

framework: {
name: getAbsolutePath('@storybook/web-components-vite'),
name: '@storybook/web-components-vite',
options: {},
},

docs: {},
docs: {
autodocs: true,
},
};
export default config;
2 changes: 1 addition & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import {
setCustomElementsManifest,
type Preview,
} from '@storybook/web-components';
import '../packages/uui-css/lib/uui-css.css';
import '../packages/uui-css/dist/uui-css.css';
import customElements from '../custom-elements.json';
import { html } from 'lit';

4 changes: 2 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ import globals from 'globals';
import pluginJs from '@eslint/js';
import tseslint from 'typescript-eslint';
import localRules from 'eslint-plugin-local-rules';
import wcPlugin from 'eslint-plugin-wc';
import litPlugin from 'eslint-plugin-lit';
import * as wcPlugin from 'eslint-plugin-wc';
import * as litPlugin from 'eslint-plugin-lit';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';

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