Skip to content

Commit

Permalink
Merge branch 'master' into ESMDevScripts
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcusNotheis authored Oct 22, 2020
2 parents bc0b0f4 + 45a6d8f commit 6f74bfd
Show file tree
Hide file tree
Showing 39 changed files with 2,107 additions and 1,196 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/workflows/compressed-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fetch-depth: 1

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: 14.x

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
persist-credentials: false

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: 14.x

Expand All @@ -26,7 +26,7 @@ jobs:
yarn build:storybook
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@3.5.7
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
steps:
- uses: actions/checkout@v2.3.1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: ${{ matrix.node-version }}
- name: install dependencies
run: yarn install
- name: run tests
run: yarn test --runInBand
- name: Coveralls
uses: coverallsapp/github-action@v1.1.1
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: build project
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: 14.x

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0

- name: Use Node.js
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: '14.x'

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.0
uses: actions/setup-node@v2.1.2
with:
node-version: 14.x

Expand All @@ -43,3 +43,8 @@ jobs:
env:
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

- name: deploy docs
run: yarn deploy:storybook
env:
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)


### Bug Fixes

* **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))
* 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))





# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)

_This release is a combining the changes of `0.11.0-rc.0` and `0.11.0-rc.1` in a stable release._
Expand Down
1 change: 0 additions & 1 deletion config/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export default {
setupFiles: ['jest-canvas-mock'],
setupFilesAfterEnv: ['./config/jestsetup.ts'],
testEnvironment: 'jsdom-sixteen',
testMatch: ['<rootDir>/packages/**/?(*.)(spec|test).{js,jsx,ts,tsx}'],
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/packages/cra-template/'],
transformIgnorePatterns: ['node_modules/(?!(@ui5|lit-html))'],
moduleNameMapper: {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.11.0",
"version": "0.11.1",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
22 changes: 0 additions & 22 deletions netlify.toml

This file was deleted.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@
"@ui5/webcomponents-icons": "1.0.0-rc.9",
"react": "16.8.0",
"react-dom": "16.8.0",
"react-syntax-highlighter": "^13.5.1"
"react-syntax-highlighter": "^15.2.1"
},
"devDependencies": {
"@babel/core": "^7.11.0",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-numeric-separator": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@rollup/plugin-babel": "^5.1.0",
"@rollup/plugin-commonjs": "^14.0.0",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-decorators": "^7.12.1",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-numeric-separator": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.1",
"@babel/preset-env": "^7.12.1",
"@babel/preset-react": "^7.12.1",
"@babel/preset-typescript": "^7.12.1",
"@rollup/plugin-babel": "^5.2.1",
"@rollup/plugin-commonjs": "^15.1.0",
"@rollup/plugin-json": "^4.0.3",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-replace": "^2.3.2",
"@storybook/storybook-deployer": "^2.8.6",
"@testing-library/jest-dom": "^5.11.4",
Expand Down Expand Up @@ -91,13 +91,13 @@
"react-app-polyfill": "^1.0.6",
"rimraf": "^3.0.1",
"rollup": "^2.23.0",
"rollup-plugin-terser": "^6.1.0",
"rollup-plugin-terser": "^7.0.2",
"targz": "^1.0.1",
"typescript": "^3.9.7"
"typescript": "^4.0.3"
},
"resolutions": {
"@types/react": "16.9.34",
"@babel/runtime": "7.11.0",
"@types/react": "16.9.53",
"@babel/runtime": "7.12.1",
"react": "16.8.0",
"react-dom": "16.8.0"
},
Expand Down
11 changes: 11 additions & 0 deletions packages/base/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.

## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)


### Bug Fixes

* 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))





# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)

**Note:** Version bump only for package @ui5/webcomponents-react-base
Expand Down
9 changes: 3 additions & 6 deletions packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-react-base",
"version": "0.11.0",
"version": "0.11.1",
"description": "Base for ui5-webcomponents-react",
"main": "index.cjs.js",
"module": "index.esm.js",
Expand All @@ -26,15 +26,12 @@
"build:types": "tsc --declaration --emitDeclarationOnly --declarationDir . --removeComments false"
},
"dependencies": {
"@babel/runtime": "7.11.0",
"@babel/runtime": "7.12.1",
"core-js": "3.6.5",
"intersection-observer": "0.8.0",
"intersection-observer": "0.11.0",
"resize-observer-polyfill": "1.5.1",
"smoothscroll-polyfill": "0.4.4"
},
"devDependencies": {
"@sap-theming/theming-base-content": "11.1.18"
},
"peerDependencies": {
"@ui5/webcomponents-base": "1.0.0-rc.9",
"react": "^16.8.0",
Expand Down
35 changes: 34 additions & 1 deletion packages/base/src/styling/ThemingParameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
* ### WARNING ###
* This is an autogenerated file, do not change manually.
* In order to recreate this file, please run 'node packages/base/scripts/cssVariables/parse.js'
* In order to recreate this file, please run 'node scripts/generate-theming-parameters.js'
*/

export const ThemingParameters = {
Expand Down Expand Up @@ -31,6 +31,7 @@ export const ThemingParameters = {
sapLink_Active_Color: 'var(--sapLink_Active_Color)',
sapLink_Visited_Color: 'var(--sapLink_Visited_Color)',
sapLink_InvertedColor: 'var(--sapLink_InvertedColor)',
sapLink_SubtleColor: 'var(--sapLink_SubtleColor)',
sapCompanyLogo: 'var(--sapCompanyLogo)',
sapBackgroundImage: 'var(--sapBackgroundImage)',
sapBackgroundImageOpacity: 'var(--sapBackgroundImageOpacity)',
Expand Down Expand Up @@ -69,13 +70,37 @@ export const ThemingParameters = {
sapInformationBackground: 'var(--sapInformationBackground)',
sapNeutralBackground: 'var(--sapNeutralBackground)',
sapIndicationColor_1: 'var(--sapIndicationColor_1)',
sapIndicationColor_1_Hover_Background: 'var(--sapIndicationColor_1_Hover_Background)',
sapIndicationColor_1_Active_Background: 'var(--sapIndicationColor_1_Active_Background)',
sapIndicationColor_1_TextColor: 'var(--sapIndicationColor_1_TextColor)',
sapIndicationColor_2: 'var(--sapIndicationColor_2)',
sapIndicationColor_2_Hover_Background: 'var(--sapIndicationColor_2_Hover_Background)',
sapIndicationColor_2_Active_Background: 'var(--sapIndicationColor_2_Active_Background)',
sapIndicationColor_2_TextColor: 'var(--sapIndicationColor_2_TextColor)',
sapIndicationColor_3: 'var(--sapIndicationColor_3)',
sapIndicationColor_3_Hover_Background: 'var(--sapIndicationColor_3_Hover_Background)',
sapIndicationColor_3_Active_Background: 'var(--sapIndicationColor_3_Active_Background)',
sapIndicationColor_3_TextColor: 'var(--sapIndicationColor_3_TextColor)',
sapIndicationColor_4: 'var(--sapIndicationColor_4)',
sapIndicationColor_4_Hover_Background: 'var(--sapIndicationColor_4_Hover_Background)',
sapIndicationColor_4_Active_Background: 'var(--sapIndicationColor_4_Active_Background)',
sapIndicationColor_4_TextColor: 'var(--sapIndicationColor_4_TextColor)',
sapIndicationColor_5: 'var(--sapIndicationColor_5)',
sapIndicationColor_5_Hover_Background: 'var(--sapIndicationColor_5_Hover_Background)',
sapIndicationColor_5_Active_Background: 'var(--sapIndicationColor_5_Active_Background)',
sapIndicationColor_5_TextColor: 'var(--sapIndicationColor_5_TextColor)',
sapIndicationColor_6: 'var(--sapIndicationColor_6)',
sapIndicationColor_6_Hover_Background: 'var(--sapIndicationColor_6_Hover_Background)',
sapIndicationColor_6_Active_Background: 'var(--sapIndicationColor_6_Active_Background)',
sapIndicationColor_6_TextColor: 'var(--sapIndicationColor_6_TextColor)',
sapIndicationColor_7: 'var(--sapIndicationColor_7)',
sapIndicationColor_7_Hover_Background: 'var(--sapIndicationColor_7_Hover_Background)',
sapIndicationColor_7_Active_Background: 'var(--sapIndicationColor_7_Active_Background)',
sapIndicationColor_7_TextColor: 'var(--sapIndicationColor_7_TextColor)',
sapIndicationColor_8: 'var(--sapIndicationColor_8)',
sapIndicationColor_8_Hover_Background: 'var(--sapIndicationColor_8_Hover_Background)',
sapIndicationColor_8_Active_Background: 'var(--sapIndicationColor_8_Active_Background)',
sapIndicationColor_8_TextColor: 'var(--sapIndicationColor_8_TextColor)',
sapElement_LineHeight: 'var(--sapElement_LineHeight)',
sapElement_Height: 'var(--sapElement_Height)',
sapElement_BorderWidth: 'var(--sapElement_BorderWidth)',
Expand Down Expand Up @@ -253,6 +278,14 @@ export const ThemingParameters = {
sapButton_Success_Hover_TextColor: 'var(--sapButton_Success_Hover_TextColor)',
sapButton_Success_Active_Background: 'var(--sapButton_Success_Active_Background)',
sapButton_Success_Active_BorderColor: 'var(--sapButton_Success_Active_BorderColor)',
sapButton_Information_Background: 'var(--sapButton_Information_Background)',
sapButton_Information_BorderColor: 'var(--sapButton_Information_BorderColor)',
sapButton_Information_TextColor: 'var(--sapButton_Information_TextColor)',
sapButton_Information_Hover_Background: 'var(--sapButton_Information_Hover_Background)',
sapButton_Information_Hover_BorderColor: 'var(--sapButton_Information_Hover_BorderColor)',
sapButton_Information_Hover_TextColor: 'var(--sapButton_Information_Hover_TextColor)',
sapButton_Information_Active_Background: 'var(--sapButton_Information_Active_Background)',
sapButton_Information_Active_BorderColor: 'var(--sapButton_Information_Active_BorderColor)',
sapButton_Neutral_Background: 'var(--sapButton_Neutral_Background)',
sapButton_Neutral_BorderColor: 'var(--sapButton_Neutral_BorderColor)',
sapButton_Neutral_TextColor: 'var(--sapButton_Neutral_TextColor)',
Expand Down
8 changes: 8 additions & 0 deletions packages/charts/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.

## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)

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





# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)

**Note:** Version bump only for package @ui5/webcomponents-react-charts
Expand Down
6 changes: 3 additions & 3 deletions packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-react-charts",
"version": "0.11.0",
"version": "0.11.1",
"description": "Charts for ui5-webcomponents-react",
"main": "index.cjs.js",
"module": "index.esm.js",
Expand All @@ -20,9 +20,9 @@
"build:types": "tsc --declaration --emitDeclarationOnly --declarationDir . --removeComments false || exit 0"
},
"dependencies": {
"@babel/runtime": "7.11.0",
"@babel/runtime": "7.12.1",
"lodash": "^4.17.20",
"react-content-loader": "5.1.0",
"react-content-loader": "5.1.3",
"recharts": "2.0.0-beta.6"
},
"peerDependencies": {
Expand Down
11 changes: 11 additions & 0 deletions packages/main/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.

## [0.11.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0...v0.11.1) (2020-10-21)


### Bug Fixes

* **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))





# [0.11.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.11.0-rc.1...v0.11.0) (2020-10-15)


Expand Down
Loading

0 comments on commit 6f74bfd

Please sign in to comment.