Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/siemens/ix into feature/new…
Browse files Browse the repository at this point in the history
…-docs
  • Loading branch information
goncalosard committed Sep 30, 2022
2 parents 838fbab + 32f2e5c commit ef3e055
Show file tree
Hide file tree
Showing 21 changed files with 255 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions/visual-regression/action.yml
Expand Up @@ -15,5 +15,5 @@ runs:
if: always()
with:
name: playwright-report
path: playwright-report/
path: ./packages/core/playwright-report/
retention-days: 2
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
@@ -1,6 +1,6 @@
name: build

on: [push, pull_request, workflow_dispatch]
on: [push, pull_request, workflow_dispatch, workflow_call]

concurrency:
group: ci-${{ github.sha }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-pages.yml
Expand Up @@ -14,7 +14,6 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/workflows/actions/install
- uses: ./.github/workflows/actions/build

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
Expand Down
35 changes: 24 additions & 11 deletions .github/workflows/pre-publish.yml
@@ -1,4 +1,4 @@
name: pre-publish
name: Publish Beta

on:
push:
Expand All @@ -10,20 +10,33 @@ concurrency:
cancel-in-progress: true

jobs:
build:
build-lib:
uses: ./.github/workflows/build.yml
deploy:
needs: [build-lib]
runs-on: ubuntu-latest
container:
image: node:16.16.0
env:
DEBIAN_FRONTEND: noninteractive
steps:
- uses: actions/checkout@v3

# - uses: ./.github/workflows/actions/build

# - uses: ./.github/workflows/actions/test

# - name: Publish beta version to npmjs.org
# run: yarn publish --access public --tag beta
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- uses: actions/cache@v2
id: build
with:
key: build-${{ github.sha }}
path: |
packages/**/dist
packages/**/www
packages/**/loader
packages/**/build
- name: Publish beta version to npmjs.org
run: |
yarn workspace @siemens/ix publish --access public --tag beta
yarn workspace @siemens/ix-angular publish --access public --tag beta
yarn workspace @siemens/ix-react publish --access public --tag beta
yarn workspace @siemens/ix-aggrid publish --access public --tag beta
yarn workspace @siemens/ix-echarts publish --access public --tag beta
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
35 changes: 24 additions & 11 deletions .github/workflows/publish.yml
@@ -1,4 +1,4 @@
name: publish
name: Publish

on:
push:
Expand All @@ -10,20 +10,33 @@ concurrency:
cancel-in-progress: true

jobs:
build:
build-lib:
uses: ./.github/workflows/build.yml
deploy:
needs: [build-lib]
runs-on: ubuntu-latest
container:
image: node:16.16.0
env:
DEBIAN_FRONTEND: noninteractive
steps:
- uses: actions/checkout@v3

# - uses: ./.github/workflows/actions/build

# - uses: ./.github/workflows/actions/test

# - name: Publish to npmjs.org
# run: yarn publish --access public
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- uses: actions/cache@v2
id: build
with:
key: build-${{ github.sha }}
path: |
packages/**/dist
packages/**/www
packages/**/loader
packages/**/build
- name: Publish beta version to npmjs.org
run: |
yarn workspace @siemens/ix publish --access public
yarn workspace @siemens/ix-angular publish --access public
yarn workspace @siemens/ix-react publish --access public
yarn workspace @siemens/ix-aggrid publish --access public
yarn workspace @siemens/ix-echarts publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
76 changes: 72 additions & 4 deletions CHANGELOG.md
@@ -1,5 +1,73 @@
<!--
SPDX-FileCopyrightText: 2022 Siemens AG
# 1.0.0-beta.2 (2022-09-30)


### Bug Fixes

* **aggrid/style:** use theme variables in filter ([79a1e87](https://github.com/siemens/ix/commit/79a1e8748bc4b82f43cd8314a85ad9cb716d00bf))
* **angular-test-app:** remove path overwrite ([606f2e4](https://github.com/siemens/ix/commit/606f2e4516ebecca3a478e68a4d361b7490d2e3d))
* build & assets ([df0a03b](https://github.com/siemens/ix/commit/df0a03b8f8eb5dbc0e08fb402ded1bc8e1b6603c))
* **core/breadcrumb:** fix color and alignment of button ([1564fd8](https://github.com/siemens/ix/commit/1564fd803337813a7a76c385f86c231a7ecbd80d)), closes [#14](https://github.com/siemens/ix/issues/14)
* **core/button:** add default button height ([51218e6](https://github.com/siemens/ix/commit/51218e683cc4e65174a0a053eddbf0c51dd5a79c))
* **core/dropdown:** migrate to shadowdom ([8a52d17](https://github.com/siemens/ix/commit/8a52d175ab8fdc3418effe1bc9cb286accf8ab31))
* **core/group:** fix focus visual and behavior ([ecaa4ba](https://github.com/siemens/ix/commit/ecaa4bae21122c3012ffb0fad06ba1dfe03b74a5))
* **core/group:** prevent null pointer exception ([d22abe0](https://github.com/siemens/ix/commit/d22abe066dc21ff2b33cdffc71939bd659c8eb94))
* **core/input:** fix border radius ([13efded](https://github.com/siemens/ix/commit/13efdeda8a929d56c3b4155d70d797678816bb19))
* **core/modal:** add branch for missing 'beforeDismiss' callback' ([4904c9d](https://github.com/siemens/ix/commit/4904c9d0f9146759a72117aa796d4dfa47e26200))
* **core/modal:** update styling ([922fc01](https://github.com/siemens/ix/commit/922fc0160225347241be90942a1e223904aff41c))
* **core/scss:** fix import path of shadow ([dd25727](https://github.com/siemens/ix/commit/dd25727d1f7d812c196bf77f8580f83f1e481835))
* **core/style:** remove siemens logo from classic theme ([646a920](https://github.com/siemens/ix/commit/646a920d61217460ced4c5587c1d632c858276c6))
* **core/style:** update theme variables with latest zeplin export ([e1fb195](https://github.com/siemens/ix/commit/e1fb195e5e120a202311fbd2922106a5ce5b236b))
* **core/toast:** update styling ([080c511](https://github.com/siemens/ix/commit/080c511a75bbab72858ff03604fa97d2e3c77b71))
* **core:** fix url in bug property of root package.json ([9613f43](https://github.com/siemens/ix/commit/9613f43097b48c6d73e8e912e52f8ea6e52c6e3f))
* **core:** removed & ignored build file from git ([1b69172](https://github.com/siemens/ix/commit/1b69172682867e2275712d279b4a4c6d54edd474))
* **docs:** added missing dependency & unix paths fix ([abe7f0c](https://github.com/siemens/ix/commit/abe7f0cd1b66cc9443843e860a9b78d526ae24aa))
* **docs:** warning normalized ([036a100](https://github.com/siemens/ix/commit/036a10097bac04c5cbc746be8685863730eabecd))
* **documentation/generate-api:** fix licence header generation ([e430e14](https://github.com/siemens/ix/commit/e430e1468a17c8d79fc9873c1198e0b2f98b8c5a))
* **documentation:** copy brand-theme without node_modules ([c86c841](https://github.com/siemens/ix/commit/c86c841294842e2587cf28473a8f1e4a3dec1546))
* **react-test-app:** add modal preview route ([2567cd3](https://github.com/siemens/ix/commit/2567cd3cb11b599cff9ecdce902a3ad6c4c6c598))
* **theme/color:** put static colors in seperate object hast to prevent zombie theme file generation ([0eab266](https://github.com/siemens/ix/commit/0eab2662d40fcbbd1034d5ec2292c033577523ce))


### Features

* **aggrid:** add theming support for aggrid ([d397cb1](https://github.com/siemens/ix/commit/d397cb1fc80e82fc5e09cd4b1bba0f5cf399b539))
* **aggrid:** added missing dev dependency ([147b201](https://github.com/siemens/ix/commit/147b20169f30cb845b8bbdbfa90464cc9de92d36))
* **aggrid:** init aggrid theming ([3ed2698](https://github.com/siemens/ix/commit/3ed269826d30cd61ddb298cff0f71411339191f6))
* **angular/modal:** add angular framework integration for modal ([dfa4001](https://github.com/siemens/ix/commit/dfa40015c6c99cce2ee4719627b9813fad1e5f9c))
* **angular/toast:** add framework integration for custom toast message ([7f31f9b](https://github.com/siemens/ix/commit/7f31f9b6b2f23c2810f3090c0daadbd359f24e47))
* **angular/tree:** add framework integration for tree ([4b810ef](https://github.com/siemens/ix/commit/4b810efc7b4bac888209407410892793a91fe4ed))
* **angular:** update to angular 14.2.0 ([156cd9f](https://github.com/siemens/ix/commit/156cd9f7338188cf4c266da9bdcd9147199a22ad))
* **brand-theme:** remove brand theme from core ([a333448](https://github.com/siemens/ix/commit/a3334482b441bba6f366099b9280e9371fd80c82))
* **core/colors:** update colors and generate theme ([e195c81](https://github.com/siemens/ix/commit/e195c81f0ca5f265c61cf8fd3601b09e42db8533))
* **core/date-time-picker:** migrate date-time-picker from core-ui ([2c67cad](https://github.com/siemens/ix/commit/2c67cadc335e46ef0d86c7db046b12101d0a6b96))
* **core/expanding-search:** update styling for brand and classic themes ([13d74f2](https://github.com/siemens/ix/commit/13d74f2fa7980cefcbbb1d902bdf871f8c6f6f37))
* **core/kpi:** add kpi web component ([dfc8f2c](https://github.com/siemens/ix/commit/dfc8f2c0184a062d175bc69b9a64156e4cffa8e1))
* **core/menu:** toggle between light and dark variant of current theme ([acd08f9](https://github.com/siemens/ix/commit/acd08f9c82a258b94a1a3b72eff913f15668c7e5))
* **core/style:** add html table ([07d32ce](https://github.com/siemens/ix/commit/07d32ce7db418ee594a7d068f7058ff2e972d8d8))
* **core/tabs:** add oval tab headers ([0e32dca](https://github.com/siemens/ix/commit/0e32dca9a1c5208f4767b0dc3725d017664a80be))
* **core/toggle:** add v7 styling, keyboard access and indeterminate state ([7602def](https://github.com/siemens/ix/commit/7602def3e308ec3d649249ad8bd6c292a62760c8))
* **core/upload:** add i18n for disabled state ([69a940f](https://github.com/siemens/ix/commit/69a940f2c04e3674a9036a54687310d2ef59b64b))
* **core/upload:** add multiline support and v7 styling ([f2c13e2](https://github.com/siemens/ix/commit/f2c13e22e6118f02841af2ec26696a590f9315b4))
* **core/validation-tooltip:** add validation tooltip ([3f196ac](https://github.com/siemens/ix/commit/3f196ac7e5d7fb48a3ca404165cf58f1f0fcb4d1))
* **core/workflow-steps:** add web component implementation ([dcc2bc8](https://github.com/siemens/ix/commit/dcc2bc8bd0ce7fb465c14b26d50c31037e103cd2))
* **core:** merge latest changes from core-ui repo ([73d7e33](https://github.com/siemens/ix/commit/73d7e3386605f03327248777820f3a46e6b16f30))
* **core:** remove legacy core ui styles, configurations and component prefix ([26647ec](https://github.com/siemens/ix/commit/26647ecfd4f3e826167b86ee9430f26a56ac1fa0))
* **docs:** add new landing page ([60d25e1](https://github.com/siemens/ix/commit/60d25e1f4e65a2251e39f941e065db7ed2c38f67))
* **docs:** updated package.json ([ca90333](https://github.com/siemens/ix/commit/ca90333846f5de1b3074fd7e8d1e9adcd5cee5b1))
* **documentation:** code cleanup & improvements ([ad382d9](https://github.com/siemens/ix/commit/ad382d99ccc35567313a9d8c1636bc95c1b0d198))
* **documentation:** prepare documentation for github release ([74358ef](https://github.com/siemens/ix/commit/74358ef72ff695c058342d381ecdae2f5534ff84))
* **echarts:** add echarts theme as standalone package ([0a13952](https://github.com/siemens/ix/commit/0a139529120272ab303378d4b5cd23c5318cc421))
* fulfill open source checklist ([20ec7e4](https://github.com/siemens/ix/commit/20ec7e427e2d952220884b12f7c5c45b24a45fdd))
* **global:** added yarn & turbo ([d7ff5db](https://github.com/siemens/ix/commit/d7ff5dbd7978d1b263da53ae67a9eeb794af88bf))
* **react-test-app:** migrated webpack to vite ([9cf50b5](https://github.com/siemens/ix/commit/9cf50b52c04c5346c2fbea58e3c0ed70644514b2))
* **react/tree:** add wrapper component for tree component ([7609876](https://github.com/siemens/ix/commit/7609876134460b59569ed0d086f473ff1fce15ff))
* **root:** improve ci cache ([80ff193](https://github.com/siemens/ix/commit/80ff19353bab7894a865956d719b83ccf1a0f9b3))
* **root:** update ci ([e85a34e](https://github.com/siemens/ix/commit/e85a34e18a2c414f2bb0f431c338699a49ad807f))
* **root:** updated CI for yarn ([cdd7879](https://github.com/siemens/ix/commit/cdd78799f3f31499457dd1145bd9451d30871cf8))
* **root:** updated lock file ([c3de9f9](https://github.com/siemens/ix/commit/c3de9f9b9f738b67ec8130ca3737f993ba926172))
* **root:** updated readme ([353efe5](https://github.com/siemens/ix/commit/353efe520f1c07639618fea1ec04701d8dd16b7c))
* **root:** updated readme & package.json ([310de98](https://github.com/siemens/ix/commit/310de9859a36cac1b3ba5195720f1fbd818796d0))
* use brand-theme optional in core and docs ([8978d3d](https://github.com/siemens/ix/commit/8978d3d61770b818405267b0cf6361b398e2c683))



SPDX-License-Identifier: MIT
-->
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "ix",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"license": "SEE LICENSE IN LICENSE.md",
"description": "Siemens iX monorepo",
"author": "Siemens AG",
Expand Down
6 changes: 3 additions & 3 deletions packages/aggrid/package.json
@@ -1,7 +1,7 @@
{
"name": "@siemens/ix-aggrid",
"description": "AG Grid theme based on ix theme variables",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
"es2015": "dist/esm/index.mjs",
Expand Down Expand Up @@ -31,10 +31,10 @@
"puppeteer": "^10.0.0",
"ag-grid-community": "^28.0.2",
"@stencil/sass": "~1.5.2",
"@siemens/ix": "~1.0.0-beta.1"
"@siemens/ix": "~1.0.0-beta.2"
},
"peerDependencies": {
"ag-grid-community": "^28.0.2",
"@siemens/ix": "~1.0.0-beta.1"
"@siemens/ix": "~1.0.0-beta.2"
}
}
8 changes: 4 additions & 4 deletions packages/angular-test-app/package.json
@@ -1,6 +1,6 @@
{
"name": "angular-test-app",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand All @@ -19,9 +19,9 @@
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router": "^14.2.0",
"@siemens/ix-icons": "~1.0.0-beta.3",
"@siemens/ix": "~1.0.0-beta.1",
"@siemens/ix-aggrid": "~1.0.0-beta.1",
"@siemens/ix-angular": "~1.0.0-beta.1",
"@siemens/ix": "~1.0.0-beta.2",
"@siemens/ix-aggrid": "~1.0.0-beta.2",
"@siemens/ix-angular": "~1.0.0-beta.2",
"ag-grid-angular": "^28.1.0",
"ag-grid-community": "^28.1.0",
"rxjs": "~7.5.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/angular/package.json
@@ -1,14 +1,14 @@
{
"name": "@siemens/ix-angular",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"description": "Siemens iX for Angular",
"scripts": {
"build": "ng-packagr -c tsconfig.json",
"fix-packagejson": ""
},
"license": "MIT",
"dependencies": {
"@siemens/ix": "~1.0.0-beta.1",
"@siemens/ix": "~1.0.0-beta.2",
"@siemens/ix-icons": "~1.0.0-beta.3"
},
"peerDependencies": {
Expand All @@ -19,7 +19,7 @@
"@angular/compiler": "^14.2.0",
"@angular/compiler-cli": "^14.2.0",
"@angular/core": "^14.2.0",
"@siemens/ix": "~1.0.0-beta.1",
"@siemens/ix": "~1.0.0-beta.2",
"fs-extra": "^10.1.0",
"ng-packagr": "^14.2.0",
"typescript": "4.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
@@ -1,6 +1,6 @@
{
"name": "@siemens/ix",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"license": "MIT",
"description": "Siemens iX Web Components",
"main": "dist/index.cjs.js",
Expand Down

0 comments on commit ef3e055

Please sign in to comment.