Skip to content

Move all packages to @ui5 namespace #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 26, 2019
Merged

Move all packages to @ui5 namespace #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a631a
refactor(framework): Move all packages to `@ui5` namespace
MarcusNotheis Jun 26, 2019
b657a11
docs: Fixed some demos
MarcusNotheis Jun 26, 2019
bbb2e97
chore: Exclude enums from code coverage
MarcusNotheis Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ build
/packages/*/npm/**/*.d.ts
.out
lerna-debug.log
packages/fiori3/scripts/wrapperGeneration/json
packages/main/scripts/wrapperGeneration/json
8 changes: 4 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### Bug Fixes

* **fiori3:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))
* **main:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))



Expand Down Expand Up @@ -47,7 +47,7 @@ Please refer to the [UI5 Web Components Changelog](https://github.com/SAP/ui5-we

### BREAKING CHANGES

* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5-webcomponents-react/base`
* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5/webcomponents-react-base`
* **base:** Deleted Themes `sap_belize`, `sap_belize_plus` and `sap_belize_hcb`
* **base:** Removed `createThemeMap` from base
* **base:** Removed `getThemeClassFor` from base
Expand Down Expand Up @@ -76,7 +76,7 @@ Please refer to the [UI5 Web Components Changelog](https://github.com/SAP/ui5-we

## [0.3.2-rc.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.2-rc.0...v0.3.2-rc.1) (2019-06-14)

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



Expand Down Expand Up @@ -133,7 +133,7 @@ See also [UI5-WebComponents 0.12.0](https://github.com/SAP/ui5-webcomponents/rel

## [0.3.1-rc.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.0...v0.3.1-rc.0) (2019-06-03)

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



Expand Down
32 changes: 16 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ You can play around with our components by visiting our [Storybook](https://sap.

### Package Overview

#### [@ui5-webcomponents-react/fiori3](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3) - Fiori 3 Components
[![](https://img.shields.io/npm/v/@ui5-webcomponents-react/fiori3.svg)](https://www.npmjs.com/package/@ui5-webcomponents-react/fiori3)
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/fiori3](https://img.shields.io/bundlephobia/min/@ui5-webcomponents-react/fiori3.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/fiori3](https://img.shields.io/bundlephobia/minzip/@ui5-webcomponents-react/fiori3.svg?label=gzip%20size) -->
#### [@ui5/webcomponents-react](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main) - Fiori 3 Components
[![](https://img.shields.io/npm/v/@ui5/webcomponents-react.svg)](https://www.npmjs.com/package/@ui5/webcomponents-react)
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react](https://img.shields.io/bundlephobia/min/@ui5/webcomponents-react.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react](https://img.shields.io/bundlephobia/minzip/@ui5/webcomponents-react.svg?label=gzip%20size) -->

#### [@ui5-webcomponents-react/charts](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/charts) - Fiori Charts
[![](https://img.shields.io/npm/v/@ui5-webcomponents-react/charts.svg)](https://www.npmjs.com/package/@ui5-webcomponents-react/charts)
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/charts](https://img.shields.io/bundlephobia/min/@ui5-webcomponents-react/charts.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/charts](https://img.shields.io/bundlephobia/minzip/@ui5-webcomponents-react/charts.svg?label=gzip%20size) -->
#### [@ui5/webcomponents-react-charts](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/charts) - Fiori Charts
[![](https://img.shields.io/npm/v/@ui5/webcomponents-react-charts.svg)](https://www.npmjs.com/package/@ui5/webcomponents-react-charts)
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react-charts](https://img.shields.io/bundlephobia/min/@ui5/webcomponents-react-charts.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react-charts](https://img.shields.io/bundlephobia/minzip/@ui5/webcomponents-react-charts.svg?label=gzip%20size) -->

#### [@ui5-webcomponents-react/base](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/base) - Utils
[![](https://img.shields.io/npm/v/@ui5-webcomponents-react/base.svg)](https://www.npmjs.com/package/@ui5-webcomponents-react/base)
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/base](https://img.shields.io/bundlephobia/min/@ui5-webcomponents-react/base.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5-webcomponents-react/base](https://img.shields.io/bundlephobia/minzip/@ui5-webcomponents-react/base.svg?label=gzip%20size) -->
#### [@ui5/webcomponents-react-base](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/base) - Utils
[![](https://img.shields.io/npm/v/@ui5/webcomponents-react-base.svg)](https://www.npmjs.com/package/@ui5/webcomponents-react-base)
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react-base](https://img.shields.io/bundlephobia/min/@ui5/webcomponents-react-base.svg?label=size) -->
<!-- ![https://bundlephobia.com/result?p=@ui5/webcomponents-react-base](https://img.shields.io/bundlephobia/minzip/@ui5/webcomponents-react-base.svg?label=gzip%20size) -->


<!-- *********************************************************************** -->
Expand All @@ -60,7 +60,7 @@ You can play around with our components by visiting our [Storybook](https://sap.

To consume `ui5-webcomponents-react`, first you need to install the npm module:
```sh
npm install @ui5-webcomponents-react/fiori3 --save
npm install @ui5/webcomponents-react --save
```

<!-- *********************************************************************** -->
Expand All @@ -71,7 +71,7 @@ npm install @ui5-webcomponents-react/fiori3 --save
In order to use `ui5-webcomponents-react` you have to wrap your application's root component into the `ThemeProvider`.<br/>
You will find this component most likely in `src/App.js`:
```jsx
import { ThemeProvider } from '@ui5-webcomponents-react/fiori3/lib/ThemeProvider';
import { ThemeProvider } from '@ui5/webcomponents-react/lib/ThemeProvider';
...
render() {
return (
Expand All @@ -88,7 +88,7 @@ Then, you are ready to use `ui5-webcomponents-react` and you can import the desi
For example, to use ```Button``` you need to import it:

```jsx
import { Button } from '@ui5-webcomponents-react/fiori3/lib/Button'; // loads ui5-button wrapped in a ui5-webcomponents-react component
import { Button } from '@ui5/webcomponents-react/lib/Button'; // loads ui5-button wrapped in a ui5-webcomponents-react component
```

Then, you can use the Button in your app:
Expand All @@ -97,7 +97,7 @@ Then, you can use the Button in your app:
<Button onPress={() => alert('Hello World!')}>Hello world!</Button>
```

You could import all components also from `@ui5-webcomponents-react/fiori3` directly, but this will have a negative impact on your bundle size.
You could import all components also from `@ui5/webcomponents-react` directly, but this will have a negative impact on your bundle size.

For Browser Support and the configuration of the UI5 Web Components, please take a look at the
[Browser Support](https://github.com/SAP/ui5-webcomponents#browser-support) and the
Expand Down
3 changes: 2 additions & 1 deletion config/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = {
collectCoverage: false,
collectCoverageFrom: [
'packages/**/*.{ts,tsx}',
'!packages/fiori3/src/lib/*.ts',
'!packages/main/src/lib/*.ts',
'!packages/main/src/enums/*.ts',
'!**/*.stories.tsx',
'!**/*.jss.ts',
'!**/*.karma.tsx',
Expand Down
4 changes: 2 additions & 2 deletions config/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ module.exports = function(config) {
coverageConfig,
{
browserNoActivityTimeout: 20000,
basePath: path.join(PATHS.packages, 'fiori3'),
basePath: path.join(PATHS.packages, 'main'),
browsers,
frameworks: ['mocha', 'chai'],
files: [path.join(PATHS.packages, 'fiori3', 'test', 'testRunner.js')],
files: [path.join(PATHS.packages, 'main', 'test', 'testRunner.js')],
preprocessors: {
'test/testRunner.js': ['webpack', 'sourcemap']
},
Expand Down
2 changes: 1 addition & 1 deletion config/karma.webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = function() {
},
// Need this since it's supposed to work after the compilation of .ts
enforce: 'post',
include: path.join(PATHS.packages, 'fiori3', 'src'),
include: path.join(PATHS.packages, 'main', 'src'),
exclude: [/node_modules|\.karma\.tsx?/, /jss.ts/, /stories/, /enums/, /test/, /lib/]
}
]
Expand Down
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"name": "@ui5-webcomponents-react/suite",
"version": "0.2.0",
"workspaces": [
"packages/*"
],
"private": true,
"license": "Apache-2.0",
"repository": "https://github.com/SAP/ui5-webcomponents-react",
"scripts": {
"start": "start-storybook -p 6006 -c packages/docs/.storybook",
"build": "node ./scripts/rollup/build.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/base/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### Bug Fixes

* **fiori3:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))
* **main:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))





## [0.3.2-rc.4](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/base/compare/v0.3.2-rc.3...v0.3.2-rc.4) (2019-06-24)

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



Expand All @@ -32,7 +32,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### BREAKING CHANGES

* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5-webcomponents-react/base`
* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5/webcomponents-react-base`
* **base:** Deleted Themes `sap_belize`, `sap_belize_plus` and `sap_belize_hcb`
* **base:** Removed `createThemeMap` from base
* **base:** Removed `getThemeClassFor` from base
Expand Down
8 changes: 4 additions & 4 deletions packages/base/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# @ui5-webcomponents-react/base
# @ui5/webcomponents-react-base
Base Utilities for ui5-webcomponents-react

## Installation
```
yarn add @ui5-webcomponents-react/base
yarn add @ui5/webcomponents-react-base
OR
npm install @ui5-webcomponents-react/base --save
npm install @ui5/webcomponents-react-base --save
```

## Modules
Expand All @@ -14,7 +14,7 @@ npm install @ui5-webcomponents-react/base --save
Concat multiple CSS Module into an instance of this class helper and place them into a react component.<br>
Example:
```javascript
import { StyleClassHelper } from '@ui5-webcomponents-react/base';
import { StyleClassHelper } from '@ui5/webcomponents-react-base';
import style from 'YOUR_STYLESHEET';

const classes = new StyleClassHelper.of(style.text);
Expand Down
2 changes: 1 addition & 1 deletion packages/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ui5-webcomponents-react/base",
"name": "@ui5/webcomponents-react-base",
"version": "0.3.2-rc.5",
"description": "Base for ui5-webcomponents-react",
"main": "index.cjs.js",
Expand Down
16 changes: 8 additions & 8 deletions packages/charts/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### Bug Fixes

* **fiori3:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))
* **main:** Added react-table dependency ([ebc8fc5](https://github.com/SAP/ui5-webcomponents-react/commit/ebc8fc5))





## [0.3.2-rc.4](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/charts/compare/v0.3.2-rc.3...v0.3.2-rc.4) (2019-06-24)

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



Expand All @@ -32,7 +32,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### BREAKING CHANGES

* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5-webcomponents-react/base`
* **base:** `@ui5-webcomponents-react/styles` and `@ui5-webcomponents-react/utils` are replaced by ``@ui5/webcomponents-react-base`
* **base:** Deleted Themes `sap_belize`, `sap_belize_plus` and `sap_belize_hcb`
* **base:** Removed `createThemeMap` from base
* **base:** Removed `getThemeClassFor` from base
Expand All @@ -45,15 +45,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

## [0.3.2-rc.2](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/charts/compare/v0.3.2-rc.1...v0.3.2-rc.2) (2019-06-17)

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





## [0.3.2-rc.1](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/charts/compare/v0.3.2-rc.0...v0.3.2-rc.1) (2019-06-14)

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



Expand All @@ -78,23 +78,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

## [0.3.1-rc.2](https://github.com/SAP/ui5-webcomponents-react/packages/charts/compare/v0.3.1-rc.1...v0.3.1-rc.2) (2019-06-13)

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





## [0.3.1-rc.1](https://github.com/SAP/ui5-webcomponents-react/packages/charts/compare/v0.3.1-rc.0...v0.3.1-rc.1) (2019-06-07)

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





## [0.3.1-rc.0](https://github.com/SAP/ui5-webcomponents-react/packages/charts/compare/v0.3.0...v0.3.1-rc.0) (2019-06-03)

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



Expand Down
4 changes: 2 additions & 2 deletions packages/charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# @ui5-webcomponents-react/charts
# @ui5/webcomponents-react-charts
Charts for ui5-webcomponents-react

## Usage

### Installation
```bash
yarn add @ui5-webcomponents-react/charts
yarn add @ui5/webcomponents-react-charts
```

### Documentation
Expand Down
4 changes: 2 additions & 2 deletions packages/charts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ui5-webcomponents-react/charts",
"name": "@ui5/webcomponents-react-charts",
"version": "0.3.2-rc.5",
"description": "Charts for ui5-webcomponents-react",
"main": "index.cjs.js",
Expand All @@ -17,7 +17,7 @@
"@types/chart.js": "^2.7.53"
},
"dependencies": {
"@ui5-webcomponents-react/base": "0.3.2-rc.5",
"@ui5/webcomponents-react-base": "0.3.2-rc.5",
"chart.js": "^2.8.0",
"chartjs-plugin-datalabels": "^0.6.0",
"is-mergeable-object": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/BarChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { DEFAULT_OPTIONS } from '../../config';
import { formatTooltipLabel, getTextWidth, mergeConfig } from '../../util/utils';
import { ChartBaseProps } from '../../interfaces/ChartBaseProps';
import { ChartBaseDefaultProps } from '../../util/ChartBaseDefaultProps';
import { LOG_LEVEL, Logger } from '@ui5-webcomponents-react/base';
import { LOG_LEVEL, Logger } from '@ui5/webcomponents-react-base';
import { withChartContainer } from '../ChartContainer/withChartContainer';
import { BarChartPlaceholder } from './Placeholder';

Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/ChartContainer/withChartContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { ComponentType } from 'react';
import { withStyles } from '@ui5-webcomponents-react/base';
import { withStyles } from '@ui5/webcomponents-react-base';
import hoistNonReactStatics from 'hoist-non-react-statics';
import { DEFAULT_OPTIONS } from '../../config';
import { ChartBaseProps } from '../../interfaces/ChartBaseProps';
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/Loader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { withStyles } from '@ui5-webcomponents-react/base';
import { withStyles } from '@ui5/webcomponents-react-base';
import * as React from 'react';
import { LoaderStyles } from './Loader.jss';

Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/MicroBarChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { withStyles } from '@ui5-webcomponents-react/base';
import { withStyles } from '@ui5/webcomponents-react-base';
import React, { CSSProperties, PureComponent } from 'react';
import { ChartInternalProps } from '../../interfaces/ChartInternalProps';
import { CommonProps } from '../../interfaces/CommonProps';
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/RadarChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ChartInternalProps } from '../../interfaces/ChartInternalProps';
import { formatTooltipLabel, mergeConfig } from '../../util/utils';
import { ChartBaseProps } from '../../interfaces/ChartBaseProps';
import { ChartBaseDefaultProps } from '../../util/ChartBaseDefaultProps';
import { HSLColor } from '@ui5-webcomponents-react/base';
import { HSLColor } from '@ui5/webcomponents-react-base';
import { withChartContainer } from '../ChartContainer/withChartContainer';

export interface RadarChartPropTypes extends ChartBaseProps {}
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/RadialChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base';
import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base';
import { ChartOptions } from 'chart.js';
import React, { CSSProperties, PureComponent, Ref } from 'react';
import { ChartInternalProps } from '../../interfaces/ChartInternalProps';
Expand Down
Loading