Skip to content

Commit a6778a6

Browse files
authored
Merge branch 'main' into bugfix/1080-color-picker-no-swatches
2 parents 370464a + 8f89db5 commit a6778a6

File tree

173 files changed

+1026
-656
lines changed

Some content is hidden

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

173 files changed

+1026
-656
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
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-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
7+
8+
### Bug Fixes
9+
10+
- installs postcss-import and postcss-url to ensure asset paths are correct ([04e5033](https://github.com/umbraco/Umbraco.UI/commit/04e503310b3a95043bd7df22395e4bdbc70b106c))
11+
612
# [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)
713

814
### Bug Fixes

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.14.0-rc.3",
4+
"version": "1.14.0-rc.4",
55
"preid": "rc",
66
"exact": true,
77
"noPush": true,

package-lock.json

Lines changed: 361 additions & 341 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,11 @@
106106
"lint-staged": "16.0.0",
107107
"npm-check-updates": "18.0.1",
108108
"plop": "3.1.2",
109-
"postcss": "8.5.3",
109+
"postcss": "8.5.4",
110110
"postcss-advanced-variables": "5.0.0",
111111
"postcss-cli": "11.0.1",
112-
"postcss-custom-properties": "14.0.4",
112+
"postcss-custom-properties": "14.0.5",
113+
"postcss-import": "^16.1.0",
113114
"postcss-jsx": "0.36.4",
114115
"postcss-load-config": "6.0.1",
115116
"postcss-syntax": "0.36.2",

packages/rollup-package.config.mjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { nodeResolve } from '@rollup/plugin-node-resolve';
33
import minifyHTML from 'rollup-plugin-minify-html-literals';
44
import { readPackageJson } from '../scripts/modify-pkgjson.mjs';
55
import rollupPostcss from 'rollup-plugin-postcss';
6+
import postcssUrl from 'postcss-url';
7+
import postcssImport from 'postcss-import';
68
import postcssCustomPropertiesFallback from '../scripts/postcss-custom-properties-fallback/plugin.mjs';
79
import path from 'path';
810
import processLitCSSPlugin from '../scripts/processLitCSSPlugin.mjs';
@@ -49,6 +51,11 @@ const createCSSFilesConfig = (cssFiles = []) => {
4951
plugins: [
5052
rollupPostcss({
5153
plugins: [
54+
postcssImport({
55+
plugins: [
56+
postcssUrl(), // This plugin is used to handle URLs in imported CSS files
57+
],
58+
}),
5259
postcssCustomPropertiesFallback({ importFrom: properties }),
5360
],
5461
extract: path.resolve(`./dist/${name}.css`),

packages/uui-action-bar/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
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-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
7+
8+
**Note:** Version bump only for package @umbraco-ui/uui-action-bar
9+
610
# [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)
711

812
**Note:** Version bump only for package @umbraco-ui/uui-action-bar

packages/uui-action-bar/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@umbraco-ui/uui-action-bar",
3-
"version": "1.14.0-rc.1",
3+
"version": "1.14.0-rc.4",
44
"license": "MIT",
55
"keywords": [
66
"Umbraco",
@@ -30,8 +30,8 @@
3030
"custom-elements.json"
3131
],
3232
"dependencies": {
33-
"@umbraco-ui/uui-base": "1.14.0-rc.1",
34-
"@umbraco-ui/uui-button-group": "1.14.0-rc.1"
33+
"@umbraco-ui/uui-base": "1.14.0-rc.4",
34+
"@umbraco-ui/uui-button-group": "1.14.0-rc.4"
3535
},
3636
"scripts": {
3737
"build": "npm run analyze && tsc --build && rollup -c rollup.config.js",

packages/uui-avatar-group/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
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-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
7+
8+
**Note:** Version bump only for package @umbraco-ui/uui-avatar-group
9+
610
# [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)
711

812
**Note:** Version bump only for package @umbraco-ui/uui-avatar-group

packages/uui-avatar-group/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@umbraco-ui/uui-avatar-group",
3-
"version": "1.14.0-rc.1",
3+
"version": "1.14.0-rc.4",
44
"license": "MIT",
55
"keywords": [
66
"Umbraco",
@@ -30,8 +30,8 @@
3030
"custom-elements.json"
3131
],
3232
"dependencies": {
33-
"@umbraco-ui/uui-avatar": "1.14.0-rc.1",
34-
"@umbraco-ui/uui-base": "1.14.0-rc.1"
33+
"@umbraco-ui/uui-avatar": "1.14.0-rc.4",
34+
"@umbraco-ui/uui-base": "1.14.0-rc.4"
3535
},
3636
"scripts": {
3737
"build": "npm run analyze && tsc --build && rollup -c rollup.config.js",

packages/uui-avatar/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
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-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
7+
8+
**Note:** Version bump only for package @umbraco-ui/uui-avatar
9+
610
# [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)
711

812
**Note:** Version bump only for package @umbraco-ui/uui-avatar

0 commit comments

Comments
 (0)