Skip to content

Commit

Permalink
Merge branch 'main' into chore-issues-commentng-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ilhan007 authored Oct 29, 2024
2 parents 7408682 + 8d971b8 commit b311ea3
Show file tree
Hide file tree
Showing 41 changed files with 279 additions and 65 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/release-rc-auto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,15 @@ jobs:
NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
run: yarn lerna publish from-git --yes

- name: Pre-Deploy
run: |
yarn ci:deploy:nightly
- name: Deploy
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: packages/website/build # The folder the action should deploy.
target-folder: nightly
clean: true
4 changes: 4 additions & 0 deletions .github/workflows/release-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
run: yarn lerna publish from-git --yes

- name: Pre-Deploy
run: |
yarn ci:deploy:nightly
- name: Deploy
uses: JamesIves/[email protected]
with:
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)


### Bug Fixes

* dev-server correctly imports yargs ([#10048](https://github.com/SAP/ui5-webcomponents/issues/10048)) ([7b5aa5e](https://github.com/SAP/ui5-webcomponents/commit/7b5aa5ebdddbbc0493f4699c1a74db497e22368b))
* **ui5-dynamic-page:** align header area with title and content ([#10053](https://github.com/SAP/ui5-webcomponents/issues/10053)) ([61e3dbd](https://github.com/SAP/ui5-webcomponents/commit/61e3dbd1f9a5b69c824cfcdae5c750d59585615a))


### Features

* **ui5-tabcontainer:** style adjustments for transparent header ([#10064](https://github.com/SAP/ui5-webcomponents/issues/10064)) ([b5e596e](https://github.com/SAP/ui5-webcomponents/commit/b5e596e542a4fbd3f0643b15d2f4023be2079f5a))





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"packages/create-package",
"packages/compat"
],
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"command": {
"publish": {
"allowBranch": "*",
Expand Down
8 changes: 8 additions & 0 deletions packages/ai/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-ai





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/webcomponents-ai
Expand Down
12 changes: 6 additions & 6 deletions packages/ai/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-ai",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: webcomponents.ai",
"ui5": {
"webComponentsPackage": true
Expand Down Expand Up @@ -45,13 +45,13 @@
"directory": "packages/ai"
},
"dependencies": {
"@ui5/webcomponents": "2.4.0-rc.2",
"@ui5/webcomponents-base": "2.4.0-rc.2",
"@ui5/webcomponents-icons": "2.4.0-rc.2",
"@ui5/webcomponents-theming": "2.4.0-rc.2"
"@ui5/webcomponents": "2.4.0-rc.3",
"@ui5/webcomponents-base": "2.4.0-rc.3",
"@ui5/webcomponents-icons": "2.4.0-rc.3",
"@ui5/webcomponents-theming": "2.4.0-rc.3"
},
"devDependencies": {
"@ui5/webcomponents-tools": "2.4.0-rc.2",
"@ui5/webcomponents-tools": "2.4.0-rc.3",
"chromedriver": "^129.0.0"
}
}
8 changes: 8 additions & 0 deletions packages/base/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-base





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)


Expand Down
4 changes: 2 additions & 2 deletions packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-base",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: webcomponents.base",
"author": "SAP SE (https://www.sap.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -52,7 +52,7 @@
},
"devDependencies": {
"@openui5/sap.ui.core": "1.120.17",
"@ui5/webcomponents-tools": "2.4.0-rc.2",
"@ui5/webcomponents-tools": "2.4.0-rc.3",
"chromedriver": "^129.0.0",
"clean-css": "^5.2.2",
"copy-and-watch": "^0.1.5",
Expand Down
8 changes: 8 additions & 0 deletions packages/compat/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-compat





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/webcomponents-compat
Expand Down
12 changes: 6 additions & 6 deletions packages/compat/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-compat",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: webcomponents.compat",
"ui5": {
"webComponentsPackage": true
Expand Down Expand Up @@ -45,13 +45,13 @@
"directory": "packages/compat"
},
"dependencies": {
"@ui5/webcomponents": "2.4.0-rc.2",
"@ui5/webcomponents-base": "2.4.0-rc.2",
"@ui5/webcomponents-icons": "2.4.0-rc.2",
"@ui5/webcomponents-theming": "2.4.0-rc.2"
"@ui5/webcomponents": "2.4.0-rc.3",
"@ui5/webcomponents-base": "2.4.0-rc.3",
"@ui5/webcomponents-icons": "2.4.0-rc.3",
"@ui5/webcomponents-theming": "2.4.0-rc.3"
},
"devDependencies": {
"@ui5/webcomponents-tools": "2.4.0-rc.2",
"@ui5/webcomponents-tools": "2.4.0-rc.3",
"chromedriver": "^129.0.0"
}
}
8 changes: 8 additions & 0 deletions packages/create-package/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/create-webcomponents-package





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/create-webcomponents-package
Expand Down
2 changes: 1 addition & 1 deletion packages/create-package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/create-webcomponents-package",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: create package",
"author": "SAP SE (https://www.sap.com)",
"license": "Apache-2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/fiori/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)


### Bug Fixes

* **ui5-dynamic-page:** align header area with title and content ([#10053](https://github.com/SAP/ui5-webcomponents/issues/10053)) ([61e3dbd](https://github.com/SAP/ui5-webcomponents/commit/61e3dbd1f9a5b69c824cfcdae5c750d59585615a))





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)


Expand Down
12 changes: 6 additions & 6 deletions packages/fiori/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-fiori",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: webcomponents.fiori",
"ui5": {
"webComponentsPackage": true
Expand Down Expand Up @@ -53,14 +53,14 @@
"directory": "packages/fiori"
},
"dependencies": {
"@ui5/webcomponents": "2.4.0-rc.2",
"@ui5/webcomponents-base": "2.4.0-rc.2",
"@ui5/webcomponents-icons": "2.4.0-rc.2",
"@ui5/webcomponents-theming": "2.4.0-rc.2",
"@ui5/webcomponents": "2.4.0-rc.3",
"@ui5/webcomponents-base": "2.4.0-rc.3",
"@ui5/webcomponents-icons": "2.4.0-rc.3",
"@ui5/webcomponents-theming": "2.4.0-rc.3",
"@zxing/library": "^0.17.1"
},
"devDependencies": {
"@ui5/webcomponents-tools": "2.4.0-rc.2",
"@ui5/webcomponents-tools": "2.4.0-rc.3",
"chromedriver": "^129.0.0",
"lit": "^2.0.0"
}
Expand Down
13 changes: 7 additions & 6 deletions packages/fiori/src/themes/ShellBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
:host(:not([hidden])) {
display: inline-block;
width: 100%;
background: var(--sapShellColor);
box-sizing: border-box;
}

:host {
Expand All @@ -19,7 +21,6 @@
display: flex;
justify-content: space-between;
align-items: center;
background: var(--sapShellColor);
height: var(--_ui5_shellbar_root_height);
font-family: "72override", var(--sapFontFamily);
font-size: var(--sapFontSize);
Expand Down Expand Up @@ -178,31 +179,31 @@ slot[name="profile"] {
margin-inline-start: 0;
}

:host([breakpoint-size="S"]) .ui5-shellbar-root {
:host([breakpoint-size="S"]) {
padding: 0 1rem;
}

:host([breakpoint-size="S"]) .ui5-shellbar-search-full-width-wrapper {
padding: 0 1rem;
}

:host([breakpoint-size="M"]) .ui5-shellbar-root {
:host([breakpoint-size="M"]) {
padding: 0 2rem;
}

:host([breakpoint-size="M"]) .ui5-shellbar-search-full-width-wrapper {
padding: 0 2rem;
}

:host([breakpoint-size="L"]) .ui5-shellbar-root {
:host([breakpoint-size="L"]) {
padding: 0 2rem;
}

:host([breakpoint-size="XL"]) .ui5-shellbar-root {
:host([breakpoint-size="XL"]) {
padding: 0 3rem;
}

:host([breakpoint-size="XXL"]) .ui5-shellbar-root {
:host([breakpoint-size="XXL"]) {
padding: 0 3rem;
}

Expand Down
8 changes: 8 additions & 0 deletions packages/icons-business-suite/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-icons-business-suite





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/webcomponents-icons-business-suite
Expand Down
6 changes: 3 additions & 3 deletions packages/icons-business-suite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-icons-business-suite",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: SAP Fiori Tools icon set",
"author": "SAP SE (https://www.sap.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,9 +28,9 @@
"directory": "packages/icons-business-suite"
},
"dependencies": {
"@ui5/webcomponents-base": "2.4.0-rc.2"
"@ui5/webcomponents-base": "2.4.0-rc.3"
},
"devDependencies": {
"@ui5/webcomponents-tools": "2.4.0-rc.2"
"@ui5/webcomponents-tools": "2.4.0-rc.3"
}
}
8 changes: 8 additions & 0 deletions packages/icons-tnt/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-icons-tnt





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/webcomponents-icons-tnt
Expand Down
6 changes: 3 additions & 3 deletions packages/icons-tnt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-icons-tnt",
"version": "2.4.0-rc.2",
"version": "2.4.0-rc.3",
"description": "UI5 Web Components: SAP Fiori Tools icon set",
"author": "SAP SE (https://www.sap.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,9 +28,9 @@
"directory": "packages/icons-tnt"
},
"dependencies": {
"@ui5/webcomponents-base": "2.4.0-rc.2"
"@ui5/webcomponents-base": "2.4.0-rc.3"
},
"devDependencies": {
"@ui5/webcomponents-tools": "2.4.0-rc.2"
"@ui5/webcomponents-tools": "2.4.0-rc.3"
}
}
8 changes: 8 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.4.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.2...v2.4.0-rc.3) (2024-10-28)

**Note:** Version bump only for package @ui5/webcomponents-icons





# [2.4.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.4.0-rc.1...v2.4.0-rc.2) (2024-10-24)

**Note:** Version bump only for package @ui5/webcomponents-icons
Expand Down
Loading

0 comments on commit b311ea3

Please sign in to comment.