Skip to content

Commit 6f74bfd

Browse files
MarcusNotheisMarcusNotheis
authored
Merge branch 'master' into ESMDevScripts
2 parents bc0b0f4 + 45a6d8f commit 6f74bfd

39 files changed

+2107
-1196
lines changed

‎.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "daily"
12+
- package-ecosystem: "npm" # See documentation for possible values
13+
directory: "/" # Location of package manifests
14+
schedule:
15+
interval: "daily"
16+
open-pull-requests-limit: 10

‎.github/workflows/compressed-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fetch-depth: 1
1313

1414
- name: Setup Node.js environment
15-
uses: actions/[email protected].0
15+
uses: actions/[email protected].2
1616
with:
1717
node-version: 14.x
1818

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
persist-credentials: false
1717

1818
- name: Setup Node.js environment
19-
uses: actions/[email protected].0
19+
uses: actions/[email protected].2
2020
with:
2121
node-version: 14.x
2222

@@ -26,7 +26,7 @@ jobs:
2626
yarn build:storybook
2727
2828
- name: Deploy 🚀
29-
uses: JamesIves/github-pages-deploy-action@3.5.7
29+
uses: JamesIves/github-pages-deploy-action@3.7.1
3030
with:
3131
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
3232
BRANCH: gh-pages # The branch the action should deploy to.

‎.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
steps:
1919
- uses: actions/[email protected]
2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/[email protected].0
21+
uses: actions/[email protected].2
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
- name: install dependencies
2525
run: yarn install
2626
- name: run tests
2727
run: yarn test --runInBand
2828
- name: Coveralls
29-
uses: coverallsapp/[email protected].1
29+
uses: coverallsapp/[email protected].2
3030
with:
3131
github-token: ${{ secrets.GITHUB_TOKEN }}
3232
- name: build project

‎.github/workflows/release-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fetch-depth: 0
2121

2222
- name: Setup Node.js environment
23-
uses: actions/[email protected].0
23+
uses: actions/[email protected].2
2424
with:
2525
node-version: 14.x
2626

‎.github/workflows/release-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818

1919
- name: Use Node.js
20-
uses: actions/[email protected].0
20+
uses: actions/[email protected].2
2121
with:
2222
node-version: '14.x'
2323

‎.github/workflows/release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fetch-depth: 0
2121

2222
- name: Setup Node.js environment
23-
uses: actions/[email protected].0
23+
uses: actions/[email protected].2
2424
with:
2525
node-version: 14.x
2626

@@ -43,3 +43,8 @@ jobs:
4343
env:
4444
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
4545
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
46+
47+
- name: deploy docs
48+
run: yarn deploy:storybook
49+
env:
50+
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
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+
## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)
7+
8+
9+
### Bug Fixes
10+
11+
* **AnalyticalTable:** mount filters popover only when it's opened ([#738](https://github.com/SAP/ui5-webcomponents-react/issues/738)) ([1350790](https://github.com/SAP/ui5-webcomponents-react/commit/135079054c0e2c4bdff4a10271fb332518eb9d13))
12+
* ensure theming parameters are in sync with ui5/webcomponents-theme-base ([#737](https://github.com/SAP/ui5-webcomponents-react/issues/737)) ([880a8ab](https://github.com/SAP/ui5-webcomponents-react/commit/880a8ab3b099aedc25847f0cdf77fc7cfa20d881))
13+
14+
15+
16+
17+
618
# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)
719

820
_This release is a combining the changes of `0.11.0-rc.0` and `0.11.0-rc.1` in a stable release._

‎config/jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export default {
2121
setupFiles: ['jest-canvas-mock'],
2222
setupFilesAfterEnv: ['./config/jestsetup.ts'],
2323
testEnvironment: 'jsdom-sixteen',
24-
testMatch: ['<rootDir>/packages/**/?(*.)(spec|test).{js,jsx,ts,tsx}'],
2524
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/packages/cra-template/'],
2625
transformIgnorePatterns: ['node_modules/(?!(@ui5|lit-html))'],
2726
moduleNameMapper: {

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.11.0",
5+
"version": "0.11.1",
66
"npmClient": "yarn",
77
"useWorkspaces": true,
88
"command": {

‎netlify.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
"@ui5/webcomponents-icons": "1.0.0-rc.9",
3333
"react": "16.8.0",
3434
"react-dom": "16.8.0",
35-
"react-syntax-highlighter": "^13.5.1"
35+
"react-syntax-highlighter": "^15.2.1"
3636
},
3737
"devDependencies": {
38-
"@babel/core": "^7.11.0",
39-
"@babel/plugin-proposal-class-properties": "^7.10.4",
40-
"@babel/plugin-proposal-decorators": "^7.10.5",
41-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
42-
"@babel/plugin-proposal-numeric-separator": "^7.10.4",
43-
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
44-
"@babel/plugin-transform-runtime": "^7.11.0",
45-
"@babel/preset-env": "^7.11.0",
46-
"@babel/preset-react": "^7.10.4",
47-
"@babel/preset-typescript": "^7.10.4",
48-
"@rollup/plugin-babel": "^5.1.0",
49-
"@rollup/plugin-commonjs": "^14.0.0",
38+
"@babel/core": "^7.12.3",
39+
"@babel/plugin-proposal-class-properties": "^7.12.1",
40+
"@babel/plugin-proposal-decorators": "^7.12.1",
41+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
42+
"@babel/plugin-proposal-numeric-separator": "^7.12.1",
43+
"@babel/plugin-proposal-optional-chaining": "^7.12.1",
44+
"@babel/plugin-transform-runtime": "^7.12.1",
45+
"@babel/preset-env": "^7.12.1",
46+
"@babel/preset-react": "^7.12.1",
47+
"@babel/preset-typescript": "^7.12.1",
48+
"@rollup/plugin-babel": "^5.2.1",
49+
"@rollup/plugin-commonjs": "^15.1.0",
5050
"@rollup/plugin-json": "^4.0.3",
51-
"@rollup/plugin-node-resolve": "^8.4.0",
51+
"@rollup/plugin-node-resolve": "^9.0.0",
5252
"@rollup/plugin-replace": "^2.3.2",
5353
"@storybook/storybook-deployer": "^2.8.6",
5454
"@testing-library/jest-dom": "^5.11.4",
@@ -91,13 +91,13 @@
9191
"react-app-polyfill": "^1.0.6",
9292
"rimraf": "^3.0.1",
9393
"rollup": "^2.23.0",
94-
"rollup-plugin-terser": "^6.1.0",
94+
"rollup-plugin-terser": "^7.0.2",
9595
"targz": "^1.0.1",
96-
"typescript": "^3.9.7"
96+
"typescript": "^4.0.3"
9797
},
9898
"resolutions": {
99-
"@types/react": "16.9.34",
100-
"@babel/runtime": "7.11.0",
99+
"@types/react": "16.9.53",
100+
"@babel/runtime": "7.12.1",
101101
"react": "16.8.0",
102102
"react-dom": "16.8.0"
103103
},

‎packages/base/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
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+
## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)
7+
8+
9+
### Bug Fixes
10+
11+
* ensure theming parameters are in sync with ui5/webcomponents-theme-base ([#737](https://github.com/SAP/ui5-webcomponents-react/issues/737)) ([880a8ab](https://github.com/SAP/ui5-webcomponents-react/commit/880a8ab3b099aedc25847f0cdf77fc7cfa20d881))
12+
13+
14+
15+
16+
617
# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)
718

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

‎packages/base/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-base",
3-
"version": "0.11.0",
3+
"version": "0.11.1",
44
"description": "Base for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",
@@ -26,15 +26,12 @@
2626
"build:types": "tsc --declaration --emitDeclarationOnly --declarationDir . --removeComments false"
2727
},
2828
"dependencies": {
29-
"@babel/runtime": "7.11.0",
29+
"@babel/runtime": "7.12.1",
3030
"core-js": "3.6.5",
31-
"intersection-observer": "0.8.0",
31+
"intersection-observer": "0.11.0",
3232
"resize-observer-polyfill": "1.5.1",
3333
"smoothscroll-polyfill": "0.4.4"
3434
},
35-
"devDependencies": {
36-
"@sap-theming/theming-base-content": "11.1.18"
37-
},
3835
"peerDependencies": {
3936
"@ui5/webcomponents-base": "1.0.0-rc.9",
4037
"react": "^16.8.0",

‎packages/base/src/styling/ThemingParameters.ts

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* ### WARNING ###
55
* This is an autogenerated file, do not change manually.
6-
* In order to recreate this file, please run 'node packages/base/scripts/cssVariables/parse.js'
6+
* In order to recreate this file, please run 'node scripts/generate-theming-parameters.js'
77
*/
88

99
export const ThemingParameters = {
@@ -31,6 +31,7 @@ export const ThemingParameters = {
3131
sapLink_Active_Color: 'var(--sapLink_Active_Color)',
3232
sapLink_Visited_Color: 'var(--sapLink_Visited_Color)',
3333
sapLink_InvertedColor: 'var(--sapLink_InvertedColor)',
34+
sapLink_SubtleColor: 'var(--sapLink_SubtleColor)',
3435
sapCompanyLogo: 'var(--sapCompanyLogo)',
3536
sapBackgroundImage: 'var(--sapBackgroundImage)',
3637
sapBackgroundImageOpacity: 'var(--sapBackgroundImageOpacity)',
@@ -69,13 +70,37 @@ export const ThemingParameters = {
6970
sapInformationBackground: 'var(--sapInformationBackground)',
7071
sapNeutralBackground: 'var(--sapNeutralBackground)',
7172
sapIndicationColor_1: 'var(--sapIndicationColor_1)',
73+
sapIndicationColor_1_Hover_Background: 'var(--sapIndicationColor_1_Hover_Background)',
74+
sapIndicationColor_1_Active_Background: 'var(--sapIndicationColor_1_Active_Background)',
75+
sapIndicationColor_1_TextColor: 'var(--sapIndicationColor_1_TextColor)',
7276
sapIndicationColor_2: 'var(--sapIndicationColor_2)',
77+
sapIndicationColor_2_Hover_Background: 'var(--sapIndicationColor_2_Hover_Background)',
78+
sapIndicationColor_2_Active_Background: 'var(--sapIndicationColor_2_Active_Background)',
79+
sapIndicationColor_2_TextColor: 'var(--sapIndicationColor_2_TextColor)',
7380
sapIndicationColor_3: 'var(--sapIndicationColor_3)',
81+
sapIndicationColor_3_Hover_Background: 'var(--sapIndicationColor_3_Hover_Background)',
82+
sapIndicationColor_3_Active_Background: 'var(--sapIndicationColor_3_Active_Background)',
83+
sapIndicationColor_3_TextColor: 'var(--sapIndicationColor_3_TextColor)',
7484
sapIndicationColor_4: 'var(--sapIndicationColor_4)',
85+
sapIndicationColor_4_Hover_Background: 'var(--sapIndicationColor_4_Hover_Background)',
86+
sapIndicationColor_4_Active_Background: 'var(--sapIndicationColor_4_Active_Background)',
87+
sapIndicationColor_4_TextColor: 'var(--sapIndicationColor_4_TextColor)',
7588
sapIndicationColor_5: 'var(--sapIndicationColor_5)',
89+
sapIndicationColor_5_Hover_Background: 'var(--sapIndicationColor_5_Hover_Background)',
90+
sapIndicationColor_5_Active_Background: 'var(--sapIndicationColor_5_Active_Background)',
91+
sapIndicationColor_5_TextColor: 'var(--sapIndicationColor_5_TextColor)',
7692
sapIndicationColor_6: 'var(--sapIndicationColor_6)',
93+
sapIndicationColor_6_Hover_Background: 'var(--sapIndicationColor_6_Hover_Background)',
94+
sapIndicationColor_6_Active_Background: 'var(--sapIndicationColor_6_Active_Background)',
95+
sapIndicationColor_6_TextColor: 'var(--sapIndicationColor_6_TextColor)',
7796
sapIndicationColor_7: 'var(--sapIndicationColor_7)',
97+
sapIndicationColor_7_Hover_Background: 'var(--sapIndicationColor_7_Hover_Background)',
98+
sapIndicationColor_7_Active_Background: 'var(--sapIndicationColor_7_Active_Background)',
99+
sapIndicationColor_7_TextColor: 'var(--sapIndicationColor_7_TextColor)',
78100
sapIndicationColor_8: 'var(--sapIndicationColor_8)',
101+
sapIndicationColor_8_Hover_Background: 'var(--sapIndicationColor_8_Hover_Background)',
102+
sapIndicationColor_8_Active_Background: 'var(--sapIndicationColor_8_Active_Background)',
103+
sapIndicationColor_8_TextColor: 'var(--sapIndicationColor_8_TextColor)',
79104
sapElement_LineHeight: 'var(--sapElement_LineHeight)',
80105
sapElement_Height: 'var(--sapElement_Height)',
81106
sapElement_BorderWidth: 'var(--sapElement_BorderWidth)',
@@ -253,6 +278,14 @@ export const ThemingParameters = {
253278
sapButton_Success_Hover_TextColor: 'var(--sapButton_Success_Hover_TextColor)',
254279
sapButton_Success_Active_Background: 'var(--sapButton_Success_Active_Background)',
255280
sapButton_Success_Active_BorderColor: 'var(--sapButton_Success_Active_BorderColor)',
281+
sapButton_Information_Background: 'var(--sapButton_Information_Background)',
282+
sapButton_Information_BorderColor: 'var(--sapButton_Information_BorderColor)',
283+
sapButton_Information_TextColor: 'var(--sapButton_Information_TextColor)',
284+
sapButton_Information_Hover_Background: 'var(--sapButton_Information_Hover_Background)',
285+
sapButton_Information_Hover_BorderColor: 'var(--sapButton_Information_Hover_BorderColor)',
286+
sapButton_Information_Hover_TextColor: 'var(--sapButton_Information_Hover_TextColor)',
287+
sapButton_Information_Active_Background: 'var(--sapButton_Information_Active_Background)',
288+
sapButton_Information_Active_BorderColor: 'var(--sapButton_Information_Active_BorderColor)',
256289
sapButton_Neutral_Background: 'var(--sapButton_Neutral_Background)',
257290
sapButton_Neutral_BorderColor: 'var(--sapButton_Neutral_BorderColor)',
258291
sapButton_Neutral_TextColor: 'var(--sapButton_Neutral_TextColor)',

‎packages/charts/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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+
## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)
7+
8+
**Note:** Version bump only for package @ui5/webcomponents-react-charts
9+
10+
11+
12+
13+
614
# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)
715

816
**Note:** Version bump only for package @ui5/webcomponents-react-charts

‎packages/charts/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-charts",
3-
"version": "0.11.0",
3+
"version": "0.11.1",
44
"description": "Charts for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",
@@ -20,9 +20,9 @@
2020
"build:types": "tsc --declaration --emitDeclarationOnly --declarationDir . --removeComments false || exit 0"
2121
},
2222
"dependencies": {
23-
"@babel/runtime": "7.11.0",
23+
"@babel/runtime": "7.12.1",
2424
"lodash": "^4.17.20",
25-
"react-content-loader": "5.1.0",
25+
"react-content-loader": "5.1.3",
2626
"recharts": "2.0.0-beta.6"
2727
},
2828
"peerDependencies": {

‎packages/main/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
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+
## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)
7+
8+
9+
### Bug Fixes
10+
11+
* **AnalyticalTable:** mount filters popover only when it's opened ([#738](https://github.com/SAP/ui5-webcomponents-react/issues/738)) ([1350790](https://github.com/SAP/ui5-webcomponents-react/commit/135079054c0e2c4bdff4a10271fb332518eb9d13))
12+
13+
14+
15+
16+
617
# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)
718

819

0 commit comments

Comments
 (0)