Merge remote-tracking branch 'origin/v1/main' into v1/contrib

Author: iOvergaard

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
+
+### Bug Fixes
+
+- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
+
 ## [1.6.1](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0...v1.6.1) (2024-02-06)
 
 ### Bug Fixes

lerna.json

@@ -1,30 +1,18 @@
 {
+  "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
   "packages": ["packages/*"],
-  "version": "1.6.1",
+  "version": "1.6.2",
+  "preid": "rc",
+  "exact": true,
+  "noPush": true,
   "npmClient": "npm",
   "useWorkspaces": true,
+  "includeMergedTags": true,
+  "conventionalCommits": true,
   "command": {
     "publish": {
       "verifyAccess": false
     }
   },
-  "ignoreChanges": [
-    ".github/**/*",
-    "**/tsconfig.json",
-    "**/*.story.ts",
-    "**/*.test.ts",
-    "**/*.md",
-    "lerna.json",
-    ".storybook/**/*",
-    "stories/**/*",
-    "storyhelpers/**/*",
-    "templates/**/*",
-    "docs/**/*",
-    "package.json",
-    "package-lock.json",
-    "images/**/*",
-    "scripts/**/*",
-    "src/**/*",
-    "templates/**/*"
-  ]
+  "ignoreChanges": ["**/*.story.ts", "**/*.test.ts", "**/*.md"]
 }

package-lock.json

@@ -34,8 +34,8 @@
     "build:prod": "npm run clean && npm run build",
     "clean": "turbo run clean --parallel",
     "lerna:publish": "npm run build:prod && npm whoami && lerna publish from-package --yes --pre-dist-tag prerelease",
-    "lerna:version": "lerna version --no-push --exact --conventional-commits --include-merged-tags --sync-workspace-lock",
-    "lerna:version:rc": "npm run lerna:version -- --conventional-prerelease --preid rc",
+    "lerna:version": "lerna version --sync-workspace-lock",
+    "lerna:version:rc": "npm run lerna:version -- --conventional-prerelease",
     "lerna:changelog": "npx lerna-changelog",
     "lerna:modify-package": "lerna exec -- node ../../scripts/modify-pkgjson.mjs",
     "bootstrap": "lerna run --scope @umbraco-ui/uui-css clean && lerna run --scope @umbraco-ui/uui-css build && node ./scripts/generate-ts-config.js",

package.json

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
+
+### Bug Fixes
+
+- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
+
 # [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
 
 **Note:** Version bump only for package @umbraco-ui/uui-box

packages/uui-box/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-box",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "license": "MIT",
   "description": "A box web component for grouping elements",
   "keywords": [
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@umbraco-ui/uui-base": "1.6.0",
-    "@umbraco-ui/uui-css": "1.4.0"
+    "@umbraco-ui/uui-css": "1.6.0"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-box/package.json

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
+
+### Bug Fixes
+
+- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
+
 # [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
 
 **Note:** Version bump only for package @umbraco-ui/uui-dialog

packages/uui-dialog/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-dialog",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@umbraco-ui/uui-base": "1.6.0",
-    "@umbraco-ui/uui-css": "1.4.0"
+    "@umbraco-ui/uui-css": "1.6.0"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-dialog/package.json

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
+
+**Note:** Version bump only for package @umbraco-ui/uui-toast-notification-container
+
 # [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
 
 **Note:** Version bump only for package @umbraco-ui/uui-toast-notification-container

packages/uui-toast-notification-container/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-toast-notification-container",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@umbraco-ui/uui-base": "1.6.0",
-    "@umbraco-ui/uui-toast-notification": "1.6.0"
+    "@umbraco-ui/uui-toast-notification": "1.6.2"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",