Skip to content

Commit 1f11427

Browse files
iOvergaardiOvergaard
committed
Merge remote-tracking branch 'origin/v1/contrib' into feature/no-implicit-lit
2 parents 49db769 + c6b4b2e commit 1f11427

File tree

16 files changed

+72
-46
lines changed

16 files changed

+72
-46
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.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
7+
8+
### Bug Fixes
9+
10+
- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
11+
612
## [1.6.1](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0...v1.6.1) (2024-02-06)
713

814
### Bug Fixes

‎lerna.json

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
{
2+
"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
23
"packages": ["packages/*"],
3-
"version": "1.6.1",
4+
"version": "1.6.2",
5+
"preid": "rc",
6+
"exact": true,
7+
"noPush": true,
48
"npmClient": "npm",
59
"useWorkspaces": true,
10+
"includeMergedTags": true,
11+
"conventionalCommits": true,
612
"command": {
713
"publish": {
814
"verifyAccess": false
915
}
1016
},
11-
"ignoreChanges": [
12-
".github/**/*",
13-
"**/tsconfig.json",
14-
"**/*.story.ts",
15-
"**/*.test.ts",
16-
"**/*.md",
17-
"lerna.json",
18-
".storybook/**/*",
19-
"stories/**/*",
20-
"storyhelpers/**/*",
21-
"templates/**/*",
22-
"docs/**/*",
23-
"package.json",
24-
"package-lock.json",
25-
"images/**/*",
26-
"scripts/**/*",
27-
"src/**/*",
28-
"templates/**/*"
29-
]
17+
"ignoreChanges": ["**/*.story.ts", "**/*.test.ts", "**/*.md"]
3018
}

‎package-lock.json

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

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"build:prod": "npm run clean && npm run build",
3535
"clean": "turbo run clean --parallel",
3636
"lerna:publish": "npm run build:prod && npm whoami && lerna publish from-package --yes --pre-dist-tag prerelease",
37-
"lerna:version": "lerna version --no-push --exact --conventional-commits --include-merged-tags --sync-workspace-lock",
38-
"lerna:version:rc": "npm run lerna:version -- --conventional-prerelease --preid rc",
37+
"lerna:version": "lerna version --sync-workspace-lock",
38+
"lerna:version:rc": "npm run lerna:version -- --conventional-prerelease",
3939
"lerna:changelog": "npx lerna-changelog",
4040
"lerna:modify-package": "lerna exec -- node ../../scripts/modify-pkgjson.mjs",
4141
"bootstrap": "lerna run --scope @umbraco-ui/uui-css clean && lerna run --scope @umbraco-ui/uui-css build && node ./scripts/generate-ts-config.js",

‎packages/uui-box/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.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
7+
8+
### Bug Fixes
9+
10+
- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
11+
612
# [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
713

814
**Note:** Version bump only for package @umbraco-ui/uui-box

‎packages/uui-box/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@umbraco-ui/uui-box",
3-
"version": "1.6.0",
3+
"version": "1.6.2",
44
"license": "MIT",
55
"description": "A box web component for grouping elements",
66
"keywords": [

‎packages/uui-dialog/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.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
7+
8+
### Bug Fixes
9+
10+
- bump dependent uui-css to correct version range ([008b0e5](https://github.com/umbraco/Umbraco.UI/commit/008b0e5a138119fb32ba3856bc6bcc9d01083535))
11+
612
# [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
713

814
**Note:** Version bump only for package @umbraco-ui/uui-dialog

‎packages/uui-dialog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@umbraco-ui/uui-dialog",
3-
"version": "1.6.0",
3+
"version": "1.6.2",
44
"license": "MIT",
55
"keywords": [
66
"Umbraco",

‎packages/uui-toast-notification-container/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.6.2](https://github.com/umbraco/Umbraco.UI/compare/v1.6.1...v1.6.2) (2024-02-06)
7+
8+
**Note:** Version bump only for package @umbraco-ui/uui-toast-notification-container
9+
610
# [1.6.0](https://github.com/umbraco/Umbraco.UI/compare/v1.6.0-rc.4...v1.6.0) (2024-02-02)
711

812
**Note:** Version bump only for package @umbraco-ui/uui-toast-notification-container

‎packages/uui-toast-notification-container/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@umbraco-ui/uui-toast-notification-container",
3-
"version": "1.6.0",
3+
"version": "1.6.2",
44
"license": "MIT",
55
"keywords": [
66
"Umbraco",
@@ -31,7 +31,7 @@
3131
],
3232
"dependencies": {
3333
"@umbraco-ui/uui-base": "1.6.0",
34-
"@umbraco-ui/uui-toast-notification": "1.6.0"
34+
"@umbraco-ui/uui-toast-notification": "1.6.2"
3535
},
3636
"scripts": {
3737
"build": "npm run analyze && tsc --build && rollup -c rollup.config.js",

0 commit comments

Comments
 (0)