diff --git a/.gitignore b/.gitignore index 803d929e863..996a479badb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ build /packages/*/npm/**/*.d.ts .out lerna-debug.log -packages/fiori3/scripts/wrapperGeneration/json +packages/main/scripts/wrapperGeneration/json diff --git a/CHANGELOG.md b/CHANGELOG.md index fe4f9a3d3f1..05e422cc5ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 80a6a67f011..686af7f5a18 100644 --- a/README.md +++ b/README.md @@ -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) - - +#### [@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) + + -#### [@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) - - +#### [@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) + + -#### [@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) - - +#### [@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) + + @@ -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 ``` @@ -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`.
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 ( @@ -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: @@ -97,7 +97,7 @@ Then, you can use the Button in your app: ``` -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 diff --git a/config/jest.config.js b/config/jest.config.js index 8a2bb46ac34..b541cef337e 100644 --- a/config/jest.config.js +++ b/config/jest.config.js @@ -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', diff --git a/config/karma.conf.js b/config/karma.conf.js index 535639dfc9a..9a964f2fb93 100644 --- a/config/karma.conf.js +++ b/config/karma.conf.js @@ -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'] }, diff --git a/config/karma.webpack.config.js b/config/karma.webpack.config.js index abd6b65f050..203434f145f 100644 --- a/config/karma.webpack.config.js +++ b/config/karma.webpack.config.js @@ -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/] } ] diff --git a/package.json b/package.json index cfeaea352d7..d865b3b5655 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/base/CHANGELOG.md b/packages/base/CHANGELOG.md index 517ba82aa01..05645dfcd9b 100644 --- a/packages/base/CHANGELOG.md +++ b/packages/base/CHANGELOG.md @@ -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)) @@ -16,7 +16,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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 @@ -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 diff --git a/packages/base/README.md b/packages/base/README.md index 64a979bbae0..bee2bdb3258 100644 --- a/packages/base/README.md +++ b/packages/base/README.md @@ -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 @@ -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.
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); diff --git a/packages/base/package.json b/packages/base/package.json index 895f9b5a0e0..1fdda38a777 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -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", diff --git a/packages/charts/CHANGELOG.md b/packages/charts/CHANGELOG.md index c9c893a3979..6c9c93796bc 100644 --- a/packages/charts/CHANGELOG.md +++ b/packages/charts/CHANGELOG.md @@ -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)) @@ -16,7 +16,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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 @@ -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 @@ -45,7 +45,7 @@ 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 @@ -53,7 +53,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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 @@ -78,7 +78,7 @@ 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 @@ -86,7 +86,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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 @@ -94,7 +94,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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 diff --git a/packages/charts/README.md b/packages/charts/README.md index 93e91a9464e..9a8b99884cd 100644 --- a/packages/charts/README.md +++ b/packages/charts/README.md @@ -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 diff --git a/packages/charts/package.json b/packages/charts/package.json index 62508158755..1775b5ede5c 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -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", @@ -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", diff --git a/packages/charts/src/components/BarChart/index.tsx b/packages/charts/src/components/BarChart/index.tsx index 54ea5d30992..507a85a18e9 100644 --- a/packages/charts/src/components/BarChart/index.tsx +++ b/packages/charts/src/components/BarChart/index.tsx @@ -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'; diff --git a/packages/charts/src/components/ChartContainer/withChartContainer.tsx b/packages/charts/src/components/ChartContainer/withChartContainer.tsx index 442cc7cd33f..4c8339e963b 100644 --- a/packages/charts/src/components/ChartContainer/withChartContainer.tsx +++ b/packages/charts/src/components/ChartContainer/withChartContainer.tsx @@ -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'; diff --git a/packages/charts/src/components/Loader/index.tsx b/packages/charts/src/components/Loader/index.tsx index e448d4b6cc8..80a50b55711 100644 --- a/packages/charts/src/components/Loader/index.tsx +++ b/packages/charts/src/components/Loader/index.tsx @@ -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'; diff --git a/packages/charts/src/components/MicroBarChart/index.tsx b/packages/charts/src/components/MicroBarChart/index.tsx index 47f948f4838..c81d297b51c 100644 --- a/packages/charts/src/components/MicroBarChart/index.tsx +++ b/packages/charts/src/components/MicroBarChart/index.tsx @@ -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'; diff --git a/packages/charts/src/components/RadarChart/index.tsx b/packages/charts/src/components/RadarChart/index.tsx index ee368ddbd2a..aa5fd52c8f3 100644 --- a/packages/charts/src/components/RadarChart/index.tsx +++ b/packages/charts/src/components/RadarChart/index.tsx @@ -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 {} diff --git a/packages/charts/src/components/RadialChart/index.tsx b/packages/charts/src/components/RadialChart/index.tsx index 4cb61d2d026..7cabbf2f2f9 100644 --- a/packages/charts/src/components/RadialChart/index.tsx +++ b/packages/charts/src/components/RadialChart/index.tsx @@ -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'; diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 6d1f618b43f..51eaae660d0 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -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)) @@ -16,7 +16,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [0.3.2-rc.4](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.2-rc.3...v0.3.2-rc.4) (2019-06-24) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -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 @@ -45,7 +45,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [0.3.2-rc.2](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.2-rc.1...v0.3.2-rc.2) (2019-06-17) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -53,7 +53,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -61,7 +61,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [0.3.2-rc.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.1-rc.2...v0.3.2-rc.0) (2019-06-14) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -69,7 +69,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [0.3.1-rc.2](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.1-rc.1...v0.3.1-rc.2) (2019-06-13) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -77,7 +77,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [0.3.1-rc.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.1-rc.0...v0.3.1-rc.1) (2019-06-07) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -85,7 +85,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [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/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli @@ -93,10 +93,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.3.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.2.0...v0.3.0) (2019-06-03) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli # 0.2.0 (2019-05-15) -**Note:** Version bump only for package @ui5-webcomponents-react/cli +**Note:** Version bump only for package @ui5/webcomponents-react-cli diff --git a/packages/cli/README.md b/packages/cli/README.md index 2d9da7e2e4d..24a3da963cc 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -1,4 +1,4 @@ -# @ui5-webcomponents-react/cli +# @ui5/webcomponents-react-cli CLI for ui5-webcomponents-react diff --git a/packages/cli/package.json b/packages/cli/package.json index fa13b3a784d..de822d0a257 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "name": "@ui5-webcomponents-react/cli", + "name": "@ui5/webcomponents-react-cli", "private": true, "version": "0.3.2-rc.5", "description": "CLI for creating React Components", diff --git a/packages/cli/src/create-f4r-component.js b/packages/cli/src/create-f4r-component.js index f290909d95f..1cae70ec5bd 100644 --- a/packages/cli/src/create-f4r-component.js +++ b/packages/cli/src/create-f4r-component.js @@ -39,7 +39,7 @@ const jsxSpinner = ora('Creating index.tsx').start(); // create jsx const jsxContent = ` import React, { Component, ComponentClass } from 'react'; -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import styles from './${componentName}.jss'; import { ClassProps } from '../../types/ClassProps'; diff --git a/packages/docs/.storybook/TableComponent.tsx b/packages/docs/.storybook/TableComponent.tsx index c9d003c5637..da24a9203c8 100644 --- a/packages/docs/.storybook/TableComponent.tsx +++ b/packages/docs/.storybook/TableComponent.tsx @@ -1,13 +1,4 @@ -import { - Badge, - Label, - Table, - TableCell, - TableColumn, - TableRow, - Text, - ThemeProvider -} from '@ui5-webcomponents-react/fiori3'; +import { Badge, Label, Table, TableCell, TableColumn, TableRow, Text, ThemeProvider } from '@ui5/webcomponents-react'; import React from 'react'; const columns = [ diff --git a/packages/docs/.storybook/config.js b/packages/docs/.storybook/config.js index 2044f837219..9bedb294b7b 100644 --- a/packages/docs/.storybook/config.js +++ b/packages/docs/.storybook/config.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ContentDensity, ThemeProvider, Themes } from '@ui5-webcomponents-react/fiori3'; +import { ContentDensity, ThemeProvider, Themes } from '@ui5/webcomponents-react'; import { addDecorator, addParameters, configure } from '@storybook/react'; import { makeDecorator } from '@storybook/addons'; import { select, withKnobs } from '@storybook/addon-knobs'; diff --git a/packages/docs/.storybook/decorators/withStyleInfo.tsx b/packages/docs/.storybook/decorators/withStyleInfo.tsx index 08a3cc1d784..cabb666d6dd 100644 --- a/packages/docs/.storybook/decorators/withStyleInfo.tsx +++ b/packages/docs/.storybook/decorators/withStyleInfo.tsx @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Label, Text, ThemeProvider } from '@ui5-webcomponents-react/fiori3'; +import { Label, Text, ThemeProvider } from '@ui5/webcomponents-react'; const withStyleContainer = { fontFamily: diff --git a/packages/docs/.storybook/webpack.config.js b/packages/docs/.storybook/webpack.config.js index 3666d482e68..40ab7f542e9 100644 --- a/packages/docs/.storybook/webpack.config.js +++ b/packages/docs/.storybook/webpack.config.js @@ -57,9 +57,9 @@ SKIP_DOC_GENERATION=true alias: { ...config.resolve.alias, '@shared': path.join(PATHS.root, 'shared'), - '@ui5-webcomponents-react/fiori3': path.join(PATHS.root, 'packages', 'fiori3', 'src', 'index.ts'), - '@ui5-webcomponents-react/charts': path.join(PATHS.root, 'packages', 'charts', 'src', 'index.ts'), - '@ui5-webcomponents-react/base': path.join(PATHS.root, 'packages', 'base', 'src', 'index.ts') + '@ui5/webcomponents-react': path.join(PATHS.root, 'packages', 'main', 'src', 'index.ts'), + '@ui5/webcomponents-react-charts': path.join(PATHS.root, 'packages', 'charts', 'src', 'index.ts'), + '@ui5/webcomponents-react-base': path.join(PATHS.root, 'packages', 'base', 'src', 'index.ts') } } }; diff --git a/packages/docs/Badges.tsx b/packages/docs/Badges.tsx index 904c0da3e9b..a1a6a62c4b7 100644 --- a/packages/docs/Badges.tsx +++ b/packages/docs/Badges.tsx @@ -1,4 +1,4 @@ -import { FlexBox } from '@ui5-webcomponents-react/fiori3'; +import { FlexBox } from '@ui5/webcomponents-react'; import React from 'react'; export const Badges = () => ( diff --git a/packages/docs/Welcome.tsx b/packages/docs/Welcome.tsx index dd3637bb42a..a40a400cc5f 100644 --- a/packages/docs/Welcome.tsx +++ b/packages/docs/Welcome.tsx @@ -1,4 +1,4 @@ -import { FlexBox, FlexBoxDirection, Link, Page, Text, Title } from '@ui5-webcomponents-react/fiori3'; +import { FlexBox, FlexBoxDirection, Link, Page, Text, Title } from '@ui5/webcomponents-react'; import { storiesOf } from '@storybook/react'; import 'highlight.js/styles/solarized-dark.css'; import Highlight from 'react-highlight.js'; @@ -85,7 +85,7 @@ storiesOf(' Welcome | UI5 Web Components for React', module) To consume ui5-webcomponents-react, first you need to install the ui5-webcomponents-react npm module: - npm install @ui5-webcomponents-react/fiori3 --save + npm install @ui5/webcomponents-react --save Setup your React App @@ -98,7 +98,7 @@ storiesOf(' Welcome | UI5 Web Components for React', module) {dedent`... - import { ThemeProvider } from '@ui5-webcomponents-react/fiori3/lib/ThemeProvider'; + import { ThemeProvider } from '@ui5/webcomponents-react/lib/ThemeProvider'; ... render() { return ( @@ -112,14 +112,14 @@ storiesOf(' Welcome | UI5 Web Components for React', module) Now you can use the ui5-webcomponents-react components in your app: If you want to use a Button component, import it from ui5-webcomponents-react: - {`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`} and use it in your component: {``} - You could import all components also from '@ui5-webcomponents-react/fiori3' directly, but this will have a + You could import all components also from '@ui5/webcomponents-react' directly, but this will have a negative impact on your bundle size. diff --git a/packages/fiori3/npm/index.cjs.js b/packages/fiori3/npm/index.cjs.js deleted file mode 100644 index 5bd00f2851e..00000000000 --- a/packages/fiori3/npm/index.cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/fiori3.production.min.js'); -} else { - module.exports = require('./cjs/fiori3.development.js'); -} diff --git a/packages/fiori3/npm/index.esm.js b/packages/fiori3/npm/index.esm.js deleted file mode 100644 index 81add556e59..00000000000 --- a/packages/fiori3/npm/index.esm.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./esm/fiori3.production.min.js'); -} else { - module.exports = require('./esm/fiori3.development.js'); -} diff --git a/packages/fiori3/src/webComponents/Icon/demo.stories.tsx b/packages/fiori3/src/webComponents/Icon/demo.stories.tsx deleted file mode 100644 index 4b27a7520a4..00000000000 --- a/packages/fiori3/src/webComponents/Icon/demo.stories.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { storiesOf } from '@storybook/react'; -import React from 'react'; -import { Icon } from '../../lib/Icon'; - -storiesOf('UI5 Web Components | Icon', module).add('Generated default story', () => ( - -)); diff --git a/packages/fiori3/CHANGELOG.md b/packages/main/CHANGELOG.md similarity index 60% rename from packages/fiori3/CHANGELOG.md rename to packages/main/CHANGELOG.md index e44daec7efe..0468b29fb30 100644 --- a/packages/fiori3/CHANGELOG.md +++ b/packages/main/CHANGELOG.md @@ -8,16 +8,16 @@ 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/fiori3/compare/v0.3.2-rc.3...v0.3.2-rc.4) (2019-06-24) +## [0.3.2-rc.4](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.2-rc.3...v0.3.2-rc.4) (2019-06-24) -* * chore(Web Components): Updated Web Components to v0.13.1 (#39) ([e7f6164](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/e7f6164)), closes [#39](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/39) [#36](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/36) +* * chore(Web Components): Updated Web Components to v0.13.1 (#39) ([e7f6164](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/commit/e7f6164)), closes [#39](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/issues/39) [#36](https://github.com/SAP/ui5-webcomponents-react/issues/36) ### BREAKING CHANGES @@ -37,17 +37,17 @@ Please refer to the [UI5 Web Components Changelog](https://github.com/SAP/ui5-we -## [0.3.2-rc.3](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.2-rc.2...v0.3.2-rc.3) (2019-06-24) +## [0.3.2-rc.3](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.2-rc.2...v0.3.2-rc.3) (2019-06-24) ### Code Refactoring -* **base:** Merge `styles` and `utils` into `base` ([#38](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/38)) ([9309505](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/9309505)), closes [#34](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/34) +* **base:** Merge `styles` and `utils` into `base` ([#38](https://github.com/SAP/ui5-webcomponents-react/issues/38)) ([9309505](https://github.com/SAP/ui5-webcomponents-react/commit/9309505)), closes [#34](https://github.com/SAP/ui5-webcomponents-react/issues/34) ### 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 @@ -58,12 +58,12 @@ Please refer to the [UI5 Web Components Changelog](https://github.com/SAP/ui5-we -## [0.3.2-rc.2](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.2-rc.1...v0.3.2-rc.2) (2019-06-17) +## [0.3.2-rc.2](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.2-rc.1...v0.3.2-rc.2) (2019-06-17) ### Features -* **AnalyticalTable:** Initial Implementation ([#32](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/32)) ([4f30127](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/4f30127)) +* **AnalyticalTable:** Initial Implementation ([#32](https://github.com/SAP/ui5-webcomponents-react/issues/32)) ([4f30127](https://github.com/SAP/ui5-webcomponents-react/commit/4f30127)) ### BREAKING CHANGES @@ -74,20 +74,20 @@ 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/tree/master/packages/fiori3/compare/v0.3.2-rc.0...v0.3.2-rc.1) (2019-06-14) +## [0.3.2-rc.1](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.2-rc.0...v0.3.2-rc.1) (2019-06-14) -**Note:** Version bump only for package @ui5-webcomponents-react/fiori3 +**Note:** Version bump only for package @ui5/webcomponents-react -## [0.3.2-rc.0](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.1-rc.2...v0.3.2-rc.0) (2019-06-14) +## [0.3.2-rc.0](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.1-rc.2...v0.3.2-rc.0) (2019-06-14) ### Features -* **ThemeProvider:** Read config from UI5 Web Components ([efee11f](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/efee11f)) +* **ThemeProvider:** Read config from UI5 Web Components ([efee11f](https://github.com/SAP/ui5-webcomponents-react/commit/efee11f)) ### BREAKING CHANGES @@ -99,12 +99,12 @@ Please refer to the [UI5 Web Components Changelog](https://github.com/SAP/ui5-we -## [0.3.1-rc.2](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.1-rc.1...v0.3.1-rc.2) (2019-06-13) +## [0.3.1-rc.2](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/main/compare/v0.3.1-rc.1...v0.3.1-rc.2) (2019-06-13) ### Features -* Update UI5 WebComponents to v0.12.0 ([#30](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/30)) ([4958a15](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/4958a15)) +* Update UI5 WebComponents to v0.12.0 ([#30](https://github.com/SAP/ui5-webcomponents-react/issues/30)) ([4958a15](https://github.com/SAP/ui5-webcomponents-react/commit/4958a15)) ### BREAKING CHANGES @@ -120,20 +120,20 @@ See also [UI5-WebComponents 0.12.0](https://github.com/SAP/ui5-webcomponents/rel -## [0.3.1-rc.1](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.1-rc.0...v0.3.1-rc.1) (2019-06-07) +## [0.3.1-rc.1](https://github.com/SAP/ui5-webcomponents-react/compare/v0.3.1-rc.0...v0.3.1-rc.1) (2019-06-07) ### Features -* **ObjectPage:** Added Hide Header Button ([#28](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/28)) ([5509098](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/5509098)) +* **ObjectPage:** Added Hide Header Button ([#28](https://github.com/SAP/ui5-webcomponents-react/issues/28)) ([5509098](https://github.com/SAP/ui5-webcomponents-react/commit/5509098)) -## [0.3.1-rc.0](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/compare/v0.3.0...v0.3.1-rc.0) (2019-06-03) +## [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/fiori3 +**Note:** Version bump only for package @ui5/webcomponents-react @@ -144,17 +144,17 @@ See also [UI5-WebComponents 0.12.0](https://github.com/SAP/ui5-webcomponents/rel ### Features -* Updated UI5 WebComponents to v0.11.0 ([#22](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/issues/22)) ([7dcf22b](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/7dcf22b)) -* **FilterBar:** Initial Version ([422bdbd](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/422bdbd)) -* **FilterItem:** Initial Version ([19a23ec](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/19a23ec)) -* **VariantManagement:** Initial Version ([a1e9cbb](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/a1e9cbb)) -* **FilterBar:** renderSearch function ([94b468e](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/94b468e)) +* Updated UI5 WebComponents to v0.11.0 ([#22](https://github.com/SAP/ui5-webcomponents-react/issues/22)) ([7dcf22b](https://github.com/SAP/ui5-webcomponents-react/commit/7dcf22b)) +* **FilterBar:** Initial Version ([422bdbd](https://github.com/SAP/ui5-webcomponents-react/commit/422bdbd)) +* **FilterItem:** Initial Version ([19a23ec](https://github.com/SAP/ui5-webcomponents-react/commit/19a23ec)) +* **VariantManagement:** Initial Version ([a1e9cbb](https://github.com/SAP/ui5-webcomponents-react/commit/a1e9cbb)) +* **FilterBar:** renderSearch function ([94b468e](https://github.com/SAP/ui5-webcomponents-react/commit/94b468e)) ### Bug Fixes -* **typing:** Fixed TypeScript Definitions ([440c097](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/440c097)) -* **WebComponentWrapper:** Fixed event handler removal after prop update ([2b93c12](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/2b93c12)) +* **typing:** Fixed TypeScript Definitions ([440c097](https://github.com/SAP/ui5-webcomponents-react/commit/440c097)) +* **WebComponentWrapper:** Fixed event handler removal after prop update ([2b93c12](https://github.com/SAP/ui5-webcomponents-react/commit/2b93c12)) ### BREAKING CHANGES @@ -173,9 +173,9 @@ See also [UI5-WebComponents 0.12.0](https://github.com/SAP/ui5-webcomponents/rel ### Bug Fixes -* **web-component-wrapper:** Slots must be passed as camelCase ([1671c17](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/1671c17)) +* **web-component-wrapper:** Slots must be passed as camelCase ([1671c17](https://github.com/SAP/ui5-webcomponents-react/commit/1671c17)) ### Features -* **VariantManagement:** Initial Version ([b8237ce](https://github.com/SAP/ui5-webcomponents-react/tree/master/packages/fiori3/commit/b8237ce)) +* **VariantManagement:** Initial Version ([b8237ce](https://github.com/SAP/ui5-webcomponents-react/commit/b8237ce)) diff --git a/packages/fiori3/README.md b/packages/main/README.md similarity index 83% rename from packages/fiori3/README.md rename to packages/main/README.md index c03c911c110..107f3176167 100644 --- a/packages/fiori3/README.md +++ b/packages/main/README.md @@ -1,4 +1,4 @@ -# @ui5-webcomponents-react/fiori3 +# @ui5/webcomponents-react React Components with Fiori Style @@ -9,8 +9,8 @@ Please be aware that this package is still under active development. Semantic Ve **We will not create a new major release for every breaking change** ### Installation -Using npm: `npm install @ui5-webcomponents-react/fiori3 --save`
-Using yarn: `yarn add @ui5-webcomponents-react/fiori3` +Using npm: `npm install @ui5/webcomponents-react --save`
+Using yarn: `yarn add @ui5/webcomponents-react` ### Documentation diff --git a/packages/fiori3/__karma_snapshots__/ActionSheet.md b/packages/main/__karma_snapshots__/ActionSheet.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ActionSheet.md rename to packages/main/__karma_snapshots__/ActionSheet.md diff --git a/packages/fiori3/__karma_snapshots__/AnalyticalCard.md b/packages/main/__karma_snapshots__/AnalyticalCard.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/AnalyticalCard.md rename to packages/main/__karma_snapshots__/AnalyticalCard.md diff --git a/packages/fiori3/__karma_snapshots__/AnalyticalTable.md b/packages/main/__karma_snapshots__/AnalyticalTable.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/AnalyticalTable.md rename to packages/main/__karma_snapshots__/AnalyticalTable.md diff --git a/packages/fiori3/__karma_snapshots__/Avatar.md b/packages/main/__karma_snapshots__/Avatar.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Avatar.md rename to packages/main/__karma_snapshots__/Avatar.md diff --git a/packages/fiori3/__karma_snapshots__/Badge.md b/packages/main/__karma_snapshots__/Badge.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Badge.md rename to packages/main/__karma_snapshots__/Badge.md diff --git a/packages/fiori3/__karma_snapshots__/BusyIndicator.md b/packages/main/__karma_snapshots__/BusyIndicator.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/BusyIndicator.md rename to packages/main/__karma_snapshots__/BusyIndicator.md diff --git a/packages/fiori3/__karma_snapshots__/Button.md b/packages/main/__karma_snapshots__/Button.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Button.md rename to packages/main/__karma_snapshots__/Button.md diff --git a/packages/fiori3/__karma_snapshots__/Calendar.md b/packages/main/__karma_snapshots__/Calendar.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Calendar.md rename to packages/main/__karma_snapshots__/Calendar.md diff --git a/packages/fiori3/__karma_snapshots__/CalendarHeader.md b/packages/main/__karma_snapshots__/CalendarHeader.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/CalendarHeader.md rename to packages/main/__karma_snapshots__/CalendarHeader.md diff --git a/packages/fiori3/__karma_snapshots__/Card.md b/packages/main/__karma_snapshots__/Card.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Card.md rename to packages/main/__karma_snapshots__/Card.md diff --git a/packages/fiori3/__karma_snapshots__/Carousel.md b/packages/main/__karma_snapshots__/Carousel.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Carousel.md rename to packages/main/__karma_snapshots__/Carousel.md diff --git a/packages/fiori3/__karma_snapshots__/CheckBox.md b/packages/main/__karma_snapshots__/CheckBox.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/CheckBox.md rename to packages/main/__karma_snapshots__/CheckBox.md diff --git a/packages/fiori3/__karma_snapshots__/CustomListItem.md b/packages/main/__karma_snapshots__/CustomListItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/CustomListItem.md rename to packages/main/__karma_snapshots__/CustomListItem.md diff --git a/packages/fiori3/__karma_snapshots__/DatePicker.md b/packages/main/__karma_snapshots__/DatePicker.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/DatePicker.md rename to packages/main/__karma_snapshots__/DatePicker.md diff --git a/packages/fiori3/__karma_snapshots__/DayPicker.md b/packages/main/__karma_snapshots__/DayPicker.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/DayPicker.md rename to packages/main/__karma_snapshots__/DayPicker.md diff --git a/packages/fiori3/__karma_snapshots__/Dialog.md b/packages/main/__karma_snapshots__/Dialog.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Dialog.md rename to packages/main/__karma_snapshots__/Dialog.md diff --git a/packages/fiori3/__karma_snapshots__/FilterBar.md b/packages/main/__karma_snapshots__/FilterBar.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/FilterBar.md rename to packages/main/__karma_snapshots__/FilterBar.md diff --git a/packages/fiori3/__karma_snapshots__/GroupHeaderListItem.md b/packages/main/__karma_snapshots__/GroupHeaderListItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/GroupHeaderListItem.md rename to packages/main/__karma_snapshots__/GroupHeaderListItem.md diff --git a/packages/fiori3/__karma_snapshots__/Icon.md b/packages/main/__karma_snapshots__/Icon.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Icon.md rename to packages/main/__karma_snapshots__/Icon.md diff --git a/packages/fiori3/__karma_snapshots__/Input.md b/packages/main/__karma_snapshots__/Input.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Input.md rename to packages/main/__karma_snapshots__/Input.md diff --git a/packages/fiori3/__karma_snapshots__/Label.md b/packages/main/__karma_snapshots__/Label.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Label.md rename to packages/main/__karma_snapshots__/Label.md diff --git a/packages/fiori3/__karma_snapshots__/Link.md b/packages/main/__karma_snapshots__/Link.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Link.md rename to packages/main/__karma_snapshots__/Link.md diff --git a/packages/fiori3/__karma_snapshots__/List.md b/packages/main/__karma_snapshots__/List.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/List.md rename to packages/main/__karma_snapshots__/List.md diff --git a/packages/fiori3/__karma_snapshots__/MessageBox.md b/packages/main/__karma_snapshots__/MessageBox.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/MessageBox.md rename to packages/main/__karma_snapshots__/MessageBox.md diff --git a/packages/fiori3/__karma_snapshots__/MessageStrip.md b/packages/main/__karma_snapshots__/MessageStrip.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/MessageStrip.md rename to packages/main/__karma_snapshots__/MessageStrip.md diff --git a/packages/fiori3/__karma_snapshots__/MonthPicker.md b/packages/main/__karma_snapshots__/MonthPicker.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/MonthPicker.md rename to packages/main/__karma_snapshots__/MonthPicker.md diff --git a/packages/fiori3/__karma_snapshots__/MultiComboBox.md b/packages/main/__karma_snapshots__/MultiComboBox.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/MultiComboBox.md rename to packages/main/__karma_snapshots__/MultiComboBox.md diff --git a/packages/fiori3/__karma_snapshots__/ObjectPage.md b/packages/main/__karma_snapshots__/ObjectPage.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ObjectPage.md rename to packages/main/__karma_snapshots__/ObjectPage.md diff --git a/packages/fiori3/__karma_snapshots__/ObjectPageSection.md b/packages/main/__karma_snapshots__/ObjectPageSection.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ObjectPageSection.md rename to packages/main/__karma_snapshots__/ObjectPageSection.md diff --git a/packages/fiori3/__karma_snapshots__/ObjectPageSubSection.md b/packages/main/__karma_snapshots__/ObjectPageSubSection.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ObjectPageSubSection.md rename to packages/main/__karma_snapshots__/ObjectPageSubSection.md diff --git a/packages/fiori3/__karma_snapshots__/ObjectStatus.md b/packages/main/__karma_snapshots__/ObjectStatus.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ObjectStatus.md rename to packages/main/__karma_snapshots__/ObjectStatus.md diff --git a/packages/fiori3/__karma_snapshots__/Option.md b/packages/main/__karma_snapshots__/Option.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Option.md rename to packages/main/__karma_snapshots__/Option.md diff --git a/packages/fiori3/__karma_snapshots__/Page.md b/packages/main/__karma_snapshots__/Page.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Page.md rename to packages/main/__karma_snapshots__/Page.md diff --git a/packages/fiori3/__karma_snapshots__/Panel.md b/packages/main/__karma_snapshots__/Panel.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Panel.md rename to packages/main/__karma_snapshots__/Panel.md diff --git a/packages/fiori3/__karma_snapshots__/Popover.md b/packages/main/__karma_snapshots__/Popover.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Popover.md rename to packages/main/__karma_snapshots__/Popover.md diff --git a/packages/fiori3/__karma_snapshots__/ProgressIndicator.md b/packages/main/__karma_snapshots__/ProgressIndicator.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ProgressIndicator.md rename to packages/main/__karma_snapshots__/ProgressIndicator.md diff --git a/packages/fiori3/__karma_snapshots__/RadioButton.md b/packages/main/__karma_snapshots__/RadioButton.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/RadioButton.md rename to packages/main/__karma_snapshots__/RadioButton.md diff --git a/packages/fiori3/__karma_snapshots__/SegmentedButtonItem.md b/packages/main/__karma_snapshots__/SegmentedButtonItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/SegmentedButtonItem.md rename to packages/main/__karma_snapshots__/SegmentedButtonItem.md diff --git a/packages/fiori3/__karma_snapshots__/Select.md b/packages/main/__karma_snapshots__/Select.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Select.md rename to packages/main/__karma_snapshots__/Select.md diff --git a/packages/fiori3/__karma_snapshots__/ShellBar.md b/packages/main/__karma_snapshots__/ShellBar.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ShellBar.md rename to packages/main/__karma_snapshots__/ShellBar.md diff --git a/packages/fiori3/__karma_snapshots__/ShellBarItem.md b/packages/main/__karma_snapshots__/ShellBarItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ShellBarItem.md rename to packages/main/__karma_snapshots__/ShellBarItem.md diff --git a/packages/fiori3/__karma_snapshots__/StandardListItem.md b/packages/main/__karma_snapshots__/StandardListItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/StandardListItem.md rename to packages/main/__karma_snapshots__/StandardListItem.md diff --git a/packages/fiori3/__karma_snapshots__/Switch.md b/packages/main/__karma_snapshots__/Switch.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Switch.md rename to packages/main/__karma_snapshots__/Switch.md diff --git a/packages/fiori3/__karma_snapshots__/Tab.md b/packages/main/__karma_snapshots__/Tab.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Tab.md rename to packages/main/__karma_snapshots__/Tab.md diff --git a/packages/fiori3/__karma_snapshots__/TabContainer.md b/packages/main/__karma_snapshots__/TabContainer.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TabContainer.md rename to packages/main/__karma_snapshots__/TabContainer.md diff --git a/packages/fiori3/__karma_snapshots__/TabSeparator.md b/packages/main/__karma_snapshots__/TabSeparator.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TabSeparator.md rename to packages/main/__karma_snapshots__/TabSeparator.md diff --git a/packages/fiori3/__karma_snapshots__/Table.md b/packages/main/__karma_snapshots__/Table.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Table.md rename to packages/main/__karma_snapshots__/Table.md diff --git a/packages/fiori3/__karma_snapshots__/TableCell.md b/packages/main/__karma_snapshots__/TableCell.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TableCell.md rename to packages/main/__karma_snapshots__/TableCell.md diff --git a/packages/fiori3/__karma_snapshots__/TableColumn.md b/packages/main/__karma_snapshots__/TableColumn.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TableColumn.md rename to packages/main/__karma_snapshots__/TableColumn.md diff --git a/packages/fiori3/__karma_snapshots__/TableRow.md b/packages/main/__karma_snapshots__/TableRow.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TableRow.md rename to packages/main/__karma_snapshots__/TableRow.md diff --git a/packages/fiori3/__karma_snapshots__/Text.md b/packages/main/__karma_snapshots__/Text.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Text.md rename to packages/main/__karma_snapshots__/Text.md diff --git a/packages/fiori3/__karma_snapshots__/TextArea.md b/packages/main/__karma_snapshots__/TextArea.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TextArea.md rename to packages/main/__karma_snapshots__/TextArea.md diff --git a/packages/fiori3/__karma_snapshots__/Timeline.md b/packages/main/__karma_snapshots__/Timeline.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Timeline.md rename to packages/main/__karma_snapshots__/Timeline.md diff --git a/packages/fiori3/__karma_snapshots__/TimelineItem.md b/packages/main/__karma_snapshots__/TimelineItem.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/TimelineItem.md rename to packages/main/__karma_snapshots__/TimelineItem.md diff --git a/packages/fiori3/__karma_snapshots__/Title.md b/packages/main/__karma_snapshots__/Title.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Title.md rename to packages/main/__karma_snapshots__/Title.md diff --git a/packages/fiori3/__karma_snapshots__/ToggleButton.md b/packages/main/__karma_snapshots__/ToggleButton.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ToggleButton.md rename to packages/main/__karma_snapshots__/ToggleButton.md diff --git a/packages/fiori3/__karma_snapshots__/Token.md b/packages/main/__karma_snapshots__/Token.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Token.md rename to packages/main/__karma_snapshots__/Token.md diff --git a/packages/fiori3/__karma_snapshots__/Tokenizer.md b/packages/main/__karma_snapshots__/Tokenizer.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Tokenizer.md rename to packages/main/__karma_snapshots__/Tokenizer.md diff --git a/packages/fiori3/__karma_snapshots__/Toolbar.md b/packages/main/__karma_snapshots__/Toolbar.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/Toolbar.md rename to packages/main/__karma_snapshots__/Toolbar.md diff --git a/packages/fiori3/__karma_snapshots__/ToolbarSpacer.md b/packages/main/__karma_snapshots__/ToolbarSpacer.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/ToolbarSpacer.md rename to packages/main/__karma_snapshots__/ToolbarSpacer.md diff --git a/packages/fiori3/__karma_snapshots__/VariantManagement.md b/packages/main/__karma_snapshots__/VariantManagement.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/VariantManagement.md rename to packages/main/__karma_snapshots__/VariantManagement.md diff --git a/packages/fiori3/__karma_snapshots__/YearPicker.md b/packages/main/__karma_snapshots__/YearPicker.md similarity index 100% rename from packages/fiori3/__karma_snapshots__/YearPicker.md rename to packages/main/__karma_snapshots__/YearPicker.md diff --git a/packages/fiori3/index.ts b/packages/main/index.ts similarity index 100% rename from packages/fiori3/index.ts rename to packages/main/index.ts diff --git a/packages/main/npm/index.cjs.js b/packages/main/npm/index.cjs.js new file mode 100644 index 00000000000..860fa689224 --- /dev/null +++ b/packages/main/npm/index.cjs.js @@ -0,0 +1,7 @@ +'use strict'; + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./cjs/main.production.min.js'); +} else { + module.exports = require('./cjs/main.development.js'); +} diff --git a/packages/main/npm/index.esm.js b/packages/main/npm/index.esm.js new file mode 100644 index 00000000000..0b944c083ed --- /dev/null +++ b/packages/main/npm/index.esm.js @@ -0,0 +1,7 @@ +'use strict'; + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./esm/main.production.min.js'); +} else { + module.exports = require('./esm/main.development.js'); +} diff --git a/packages/fiori3/package.json b/packages/main/package.json similarity index 84% rename from packages/fiori3/package.json rename to packages/main/package.json index 7931e7a9618..8cd02486b83 100644 --- a/packages/fiori3/package.json +++ b/packages/main/package.json @@ -1,11 +1,11 @@ { - "name": "@ui5-webcomponents-react/fiori3", + "name": "@ui5/webcomponents-react", "version": "0.3.2-rc.5", - "description": "Fiori 3 Components in React", + "description": "React Wrapper for UI5 Web Components and additional components", "repository": { "type": "git", "url": "https://github.com/SAP/ui5-webcomponents-react.git", - "directory": "packages/fiori3" + "directory": "packages/main" }, "main": "index.cjs.js", "module": "index.esm.js", @@ -20,7 +20,7 @@ "test:karma:update": "cross-env UPDATE=1 yarn run test:karma" }, "dependencies": { - "@ui5-webcomponents-react/base": "0.3.2-rc.5", + "@ui5/webcomponents-react-base": "0.3.2-rc.5", "@ui5/webcomponents": "0.13.1", "react-scroll": "^1.7.11", "react-table": "6.8.6", diff --git a/packages/fiori3/rollup.config.js b/packages/main/rollup.config.js similarity index 86% rename from packages/fiori3/rollup.config.js rename to packages/main/rollup.config.js index c724d4edb4e..b8dab615faf 100644 --- a/packages/fiori3/rollup.config.js +++ b/packages/main/rollup.config.js @@ -9,7 +9,7 @@ const fs = require('fs'); const pkg = require('./package.json'); const PATHS = require('../../config/paths'); -const LIB_BASE_PATH = path.resolve(PATHS.packages, 'fiori3', 'src', 'lib'); +const LIB_BASE_PATH = path.resolve(PATHS.packages, 'main', 'src', 'lib'); const allLibFiles = fs.readdirSync(LIB_BASE_PATH).filter((file) => fs.statSync(`${LIB_BASE_PATH}/${file}`).isFile()); @@ -40,7 +40,7 @@ module.exports = allLibFiles.map((file) => ({ external: (id) => EXTERNAL_MODULE_REGEX.test(id), output: [ { - file: path.resolve(PATHS.root, 'build', 'node_modules', 'fiori3', 'lib', file.replace(/\.ts$/, '.js')), + file: path.resolve(PATHS.root, 'build', 'node_modules', 'main', 'lib', file.replace(/\.ts$/, '.js')), format: 'es' } ], diff --git a/packages/fiori3/scripts/create-library-export.js b/packages/main/scripts/create-library-export.js similarity index 82% rename from packages/fiori3/scripts/create-library-export.js rename to packages/main/scripts/create-library-export.js index 9000b55dbb0..c8e7c9ce0fc 100644 --- a/packages/fiori3/scripts/create-library-export.js +++ b/packages/main/scripts/create-library-export.js @@ -2,7 +2,7 @@ const path = require('path'); const fs = require('fs'); const PATHS = require('../../../config/paths'); -const LIB_BASE_PATH = path.resolve(PATHS.packages, 'fiori3', 'src', 'lib'); +const LIB_BASE_PATH = path.resolve(PATHS.packages, 'main', 'src', 'lib'); const allLibFiles = fs .readdirSync(LIB_BASE_PATH) @@ -30,4 +30,4 @@ fileContent += ` }; `; -fs.writeFileSync(path.join(PATHS.packages, 'fiori3', 'src', 'index.ts'), fileContent); +fs.writeFileSync(path.join(PATHS.packages, 'main', 'src', 'index.ts'), fileContent); diff --git a/packages/fiori3/scripts/wrapperGeneration/diff.js b/packages/main/scripts/wrapperGeneration/diff.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/diff.js rename to packages/main/scripts/wrapperGeneration/diff.js diff --git a/packages/fiori3/scripts/wrapperGeneration/generateComponentDemos.js b/packages/main/scripts/wrapperGeneration/generateComponentDemos.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/generateComponentDemos.js rename to packages/main/scripts/wrapperGeneration/generateComponentDemos.js diff --git a/packages/fiori3/scripts/wrapperGeneration/generateTypingStatements.js b/packages/main/scripts/wrapperGeneration/generateTypingStatements.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/generateTypingStatements.js rename to packages/main/scripts/wrapperGeneration/generateTypingStatements.js diff --git a/packages/fiori3/scripts/wrapperGeneration/generateTypingsWeb.js b/packages/main/scripts/wrapperGeneration/generateTypingsWeb.js similarity index 98% rename from packages/fiori3/scripts/wrapperGeneration/generateTypingsWeb.js rename to packages/main/scripts/wrapperGeneration/generateTypingsWeb.js index 51332a815b9..243b3630fc6 100644 --- a/packages/fiori3/scripts/wrapperGeneration/generateTypingsWeb.js +++ b/packages/main/scripts/wrapperGeneration/generateTypingsWeb.js @@ -214,7 +214,7 @@ export function generateTypings(meta) { .forEach(([key]) => { typings[mapEventName(key)] = { tsType: '(event : Event) => void', - importStatement: "import { Event } from '@ui5-webcomponents-react/base';" + importStatement: "import { Event } from '@ui5/webcomponents-react-base';" }; }); diff --git a/packages/fiori3/scripts/wrapperGeneration/generateWebComponentTests.js b/packages/main/scripts/wrapperGeneration/generateWebComponentTests.js similarity index 91% rename from packages/fiori3/scripts/wrapperGeneration/generateWebComponentTests.js rename to packages/main/scripts/wrapperGeneration/generateWebComponentTests.js index 54c5dcfbd24..a54e515a0ae 100644 --- a/packages/fiori3/scripts/wrapperGeneration/generateWebComponentTests.js +++ b/packages/main/scripts/wrapperGeneration/generateWebComponentTests.js @@ -2,7 +2,7 @@ const { readdirSync, statSync, writeFileSync, existsSync } = require('fs'); const path = require('path'); const PATHS = require('../../../../config/paths'); -const WEB_COMPONENTS_ROOT_DIR = path.join(PATHS.packages, 'fiori3', 'src', 'webComponents'); +const WEB_COMPONENTS_ROOT_DIR = path.join(PATHS.packages, 'main', 'src', 'webComponents'); const webComponents = readdirSync(WEB_COMPONENTS_ROOT_DIR).filter((f) => statSync(path.join(WEB_COMPONENTS_ROOT_DIR, f)).isDirectory() diff --git a/packages/fiori3/scripts/wrapperGeneration/generateWebComponentWrappers.js b/packages/main/scripts/wrapperGeneration/generateWebComponentWrappers.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/generateWebComponentWrappers.js rename to packages/main/scripts/wrapperGeneration/generateWebComponentWrappers.js diff --git a/packages/fiori3/scripts/wrapperGeneration/parseComponentNames.js b/packages/main/scripts/wrapperGeneration/parseComponentNames.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/parseComponentNames.js rename to packages/main/scripts/wrapperGeneration/parseComponentNames.js diff --git a/packages/fiori3/scripts/wrapperGeneration/puppeteer.html b/packages/main/scripts/wrapperGeneration/puppeteer.html similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/puppeteer.html rename to packages/main/scripts/wrapperGeneration/puppeteer.html diff --git a/packages/fiori3/scripts/wrapperGeneration/puppeteerScript.js b/packages/main/scripts/wrapperGeneration/puppeteerScript.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/puppeteerScript.js rename to packages/main/scripts/wrapperGeneration/puppeteerScript.js diff --git a/packages/fiori3/scripts/wrapperGeneration/showOptions.js b/packages/main/scripts/wrapperGeneration/showOptions.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/showOptions.js rename to packages/main/scripts/wrapperGeneration/showOptions.js diff --git a/packages/fiori3/scripts/wrapperGeneration/webpack.config.js b/packages/main/scripts/wrapperGeneration/webpack.config.js similarity index 100% rename from packages/fiori3/scripts/wrapperGeneration/webpack.config.js rename to packages/main/scripts/wrapperGeneration/webpack.config.js diff --git a/packages/fiori3/src/components/ActionSheet/ActionSheet.jss.ts b/packages/main/src/components/ActionSheet/ActionSheet.jss.ts similarity index 100% rename from packages/fiori3/src/components/ActionSheet/ActionSheet.jss.ts rename to packages/main/src/components/ActionSheet/ActionSheet.jss.ts diff --git a/packages/fiori3/src/components/ActionSheet/ActionSheet.karma.tsx b/packages/main/src/components/ActionSheet/ActionSheet.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ActionSheet/ActionSheet.karma.tsx rename to packages/main/src/components/ActionSheet/ActionSheet.karma.tsx diff --git a/packages/fiori3/src/components/ActionSheet/demo.stories.tsx b/packages/main/src/components/ActionSheet/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/ActionSheet/demo.stories.tsx rename to packages/main/src/components/ActionSheet/demo.stories.tsx diff --git a/packages/fiori3/src/components/ActionSheet/index.tsx b/packages/main/src/components/ActionSheet/index.tsx similarity index 96% rename from packages/fiori3/src/components/ActionSheet/index.tsx rename to packages/main/src/components/ActionSheet/index.tsx index e678b15c0d7..837e8903b2e 100644 --- a/packages/fiori3/src/components/ActionSheet/index.tsx +++ b/packages/main/src/components/ActionSheet/index.tsx @@ -1,4 +1,4 @@ -import { Device, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Device, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, cloneElement, Component, ReactElement, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/AnalyticalCard/AnalyticalCard.jss.ts b/packages/main/src/components/AnalyticalCard/AnalyticalCard.jss.ts similarity index 89% rename from packages/fiori3/src/components/AnalyticalCard/AnalyticalCard.jss.ts rename to packages/main/src/components/AnalyticalCard/AnalyticalCard.jss.ts index eb10327ba30..ce31849c1cb 100644 --- a/packages/fiori3/src/components/AnalyticalCard/AnalyticalCard.jss.ts +++ b/packages/main/src/components/AnalyticalCard/AnalyticalCard.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const styles = ({ theme, contentDensity, parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/AnalyticalCard/AnalyticalCard.karma.tsx b/packages/main/src/components/AnalyticalCard/AnalyticalCard.karma.tsx similarity index 100% rename from packages/fiori3/src/components/AnalyticalCard/AnalyticalCard.karma.tsx rename to packages/main/src/components/AnalyticalCard/AnalyticalCard.karma.tsx diff --git a/packages/fiori3/src/components/AnalyticalCard/demo.stories.tsx b/packages/main/src/components/AnalyticalCard/demo.stories.tsx similarity index 95% rename from packages/fiori3/src/components/AnalyticalCard/demo.stories.tsx rename to packages/main/src/components/AnalyticalCard/demo.stories.tsx index 6c0e680e94d..689bada7fb9 100644 --- a/packages/fiori3/src/components/AnalyticalCard/demo.stories.tsx +++ b/packages/main/src/components/AnalyticalCard/demo.stories.tsx @@ -1,7 +1,7 @@ import { action } from '@storybook/addon-actions'; import { boolean, select } from '@storybook/addon-knobs'; import { storiesOf } from '@storybook/react'; -import { LineChart } from '@ui5-webcomponents-react/charts'; +import { LineChart } from '@ui5/webcomponents-react-charts'; import React from 'react'; import { AnalyticalCard } from '../../lib/AnalyticalCard'; import { AnalyticalCardHeader } from '../../lib/AnalyticalCardHeader'; @@ -50,7 +50,7 @@ storiesOf('Components | Analytical Card', module).add('default', () => ( } ]} height={200} - width={500} + width={270} options={{ layout: { padding: { top: 25 } diff --git a/packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts b/packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts similarity index 98% rename from packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts rename to packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts index 515522a238e..f6aa5ed042a 100644 --- a/packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts +++ b/packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.jss.ts @@ -1,4 +1,4 @@ -import { fonts, HSLColor } from '@ui5-webcomponents-react/base'; +import { fonts, HSLColor } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../../interfaces/JSSTheme'; const styles = ({ theme, contentDensity, parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx b/packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx similarity index 96% rename from packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx rename to packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx index ed67ad6f8c5..2fbace5bddb 100644 --- a/packages/fiori3/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx +++ b/packages/main/src/components/AnalyticalCard/header/AnalyticalCardHeader.tsx @@ -1,8 +1,9 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Fragment, PureComponent } from 'react'; import { ClassProps } from '../../../interfaces/ClassProps'; import { CommonProps } from '../../../interfaces/CommonProps'; import { BusyIndicator } from '../../../lib/BusyIndicator'; +import { BusyIndicatorType } from '../../../lib/BusyIndicatorType'; import { DeviationIndicator } from '../../../lib/DeviationIndicator'; import { Label } from '../../../lib/Label'; import { Text } from '../../../lib/Text'; @@ -162,7 +163,7 @@ export class AnalyticalCardHeader extends PureComponent {loading && ( - + )} diff --git a/packages/fiori3/src/components/AnalyticalCard/index.tsx b/packages/main/src/components/AnalyticalCard/index.tsx similarity index 95% rename from packages/fiori3/src/components/AnalyticalCard/index.tsx rename to packages/main/src/components/AnalyticalCard/index.tsx index 6b9a3c539af..1ff2f8f38e4 100644 --- a/packages/fiori3/src/components/AnalyticalCard/index.tsx +++ b/packages/main/src/components/AnalyticalCard/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/AnalyticalTable/AnalyticalTable.karma.tsx b/packages/main/src/components/AnalyticalTable/AnalyticalTable.karma.tsx similarity index 100% rename from packages/fiori3/src/components/AnalyticalTable/AnalyticalTable.karma.tsx rename to packages/main/src/components/AnalyticalTable/AnalyticalTable.karma.tsx diff --git a/packages/fiori3/src/components/AnalyticalTable/AnayticalTable.jss.ts b/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts similarity index 96% rename from packages/fiori3/src/components/AnalyticalTable/AnayticalTable.jss.ts rename to packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts index bfb70c10b52..0934387916a 100644 --- a/packages/fiori3/src/components/AnalyticalTable/AnayticalTable.jss.ts +++ b/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; import { ContentDensity } from '../../lib/ContentDensity'; diff --git a/packages/fiori3/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx b/packages/main/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx similarity index 98% rename from packages/fiori3/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx rename to packages/main/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx index 7764590f508..a4137869a53 100644 --- a/packages/fiori3/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx +++ b/packages/main/src/components/AnalyticalTable/columnHeader/ColumnHeaderModal.tsx @@ -1,4 +1,4 @@ -import { Event, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, FC, ReactNode } from 'react'; import { ClassProps } from '../../../interfaces/ClassProps'; import { JSSTheme } from '../../../interfaces/JSSTheme'; diff --git a/packages/fiori3/src/components/AnalyticalTable/columnHeader/index.tsx b/packages/main/src/components/AnalyticalTable/columnHeader/index.tsx similarity index 99% rename from packages/fiori3/src/components/AnalyticalTable/columnHeader/index.tsx rename to packages/main/src/components/AnalyticalTable/columnHeader/index.tsx index 3dcd8b9bad9..25b5f3c1228 100644 --- a/packages/fiori3/src/components/AnalyticalTable/columnHeader/index.tsx +++ b/packages/main/src/components/AnalyticalTable/columnHeader/index.tsx @@ -1,4 +1,4 @@ -import { Event, fonts, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, fonts, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../../interfaces/ClassProps'; import { JSSTheme } from '../../../interfaces/JSSTheme'; diff --git a/packages/fiori3/src/components/AnalyticalTable/demo/demo.stories.tsx b/packages/main/src/components/AnalyticalTable/demo/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/AnalyticalTable/demo/demo.stories.tsx rename to packages/main/src/components/AnalyticalTable/demo/demo.stories.tsx diff --git a/packages/fiori3/src/components/AnalyticalTable/demo/generateData.ts b/packages/main/src/components/AnalyticalTable/demo/generateData.ts similarity index 100% rename from packages/fiori3/src/components/AnalyticalTable/demo/generateData.ts rename to packages/main/src/components/AnalyticalTable/demo/generateData.ts diff --git a/packages/fiori3/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx similarity index 99% rename from packages/fiori3/src/components/AnalyticalTable/index.tsx rename to packages/main/src/components/AnalyticalTable/index.tsx index 64f63d0640c..ff943d2186e 100644 --- a/packages/fiori3/src/components/AnalyticalTable/index.tsx +++ b/packages/main/src/components/AnalyticalTable/index.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, CSSProperties, ReactNode, ReactText } from 'react'; import ReactTable from 'react-table'; import 'react-table/react-table.css'; diff --git a/packages/fiori3/src/components/AnalyticalTable/pagination/index.tsx b/packages/main/src/components/AnalyticalTable/pagination/index.tsx similarity index 98% rename from packages/fiori3/src/components/AnalyticalTable/pagination/index.tsx rename to packages/main/src/components/AnalyticalTable/pagination/index.tsx index a9ab4f8ddfc..9fb7e076460 100644 --- a/packages/fiori3/src/components/AnalyticalTable/pagination/index.tsx +++ b/packages/main/src/components/AnalyticalTable/pagination/index.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, FC, Fragment } from 'react'; import { ClassProps } from '../../../interfaces/ClassProps'; import { JSSTheme } from '../../../interfaces/JSSTheme'; diff --git a/packages/fiori3/src/components/AnalyticalTable/titleBar/index.tsx b/packages/main/src/components/AnalyticalTable/titleBar/index.tsx similarity index 90% rename from packages/fiori3/src/components/AnalyticalTable/titleBar/index.tsx rename to packages/main/src/components/AnalyticalTable/titleBar/index.tsx index d713a2b1690..a23a8d7356c 100644 --- a/packages/fiori3/src/components/AnalyticalTable/titleBar/index.tsx +++ b/packages/main/src/components/AnalyticalTable/titleBar/index.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import React, { FC, isValidElement, ReactNode, ReactText } from 'react'; import { Title } from '../../../lib/Title'; diff --git a/packages/fiori3/src/components/AnalyticalTable/types/ColumnType.ts b/packages/main/src/components/AnalyticalTable/types/ColumnType.ts similarity index 100% rename from packages/fiori3/src/components/AnalyticalTable/types/ColumnType.ts rename to packages/main/src/components/AnalyticalTable/types/ColumnType.ts diff --git a/packages/fiori3/src/components/AnalyticalTable/types/FilterEntry.ts b/packages/main/src/components/AnalyticalTable/types/FilterEntry.ts similarity index 100% rename from packages/fiori3/src/components/AnalyticalTable/types/FilterEntry.ts rename to packages/main/src/components/AnalyticalTable/types/FilterEntry.ts diff --git a/packages/fiori3/src/components/AutoCloseOnOutsideClick/AutoCloseOnOutsideClick.test.tsx b/packages/main/src/components/AutoCloseOnOutsideClick/AutoCloseOnOutsideClick.test.tsx similarity index 100% rename from packages/fiori3/src/components/AutoCloseOnOutsideClick/AutoCloseOnOutsideClick.test.tsx rename to packages/main/src/components/AutoCloseOnOutsideClick/AutoCloseOnOutsideClick.test.tsx diff --git a/packages/fiori3/src/components/AutoCloseOnOutsideClick/index.tsx b/packages/main/src/components/AutoCloseOnOutsideClick/index.tsx similarity index 96% rename from packages/fiori3/src/components/AutoCloseOnOutsideClick/index.tsx rename to packages/main/src/components/AutoCloseOnOutsideClick/index.tsx index 1f679c48736..7f000fed6a2 100644 --- a/packages/fiori3/src/components/AutoCloseOnOutsideClick/index.tsx +++ b/packages/main/src/components/AutoCloseOnOutsideClick/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode } from 'react'; export interface AutoCloseOnOutsideClickPropTypes { diff --git a/packages/fiori3/src/components/Avatar/Avatar.jss.ts b/packages/main/src/components/Avatar/Avatar.jss.ts similarity index 94% rename from packages/fiori3/src/components/Avatar/Avatar.jss.ts rename to packages/main/src/components/Avatar/Avatar.jss.ts index fc263f348df..74a4eef996d 100644 --- a/packages/fiori3/src/components/Avatar/Avatar.jss.ts +++ b/packages/main/src/components/Avatar/Avatar.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const size = (s) => ({ diff --git a/packages/fiori3/src/components/Avatar/Avatar.karma.tsx b/packages/main/src/components/Avatar/Avatar.karma.tsx similarity index 99% rename from packages/fiori3/src/components/Avatar/Avatar.karma.tsx rename to packages/main/src/components/Avatar/Avatar.karma.tsx index 5d1f8fe3adc..8253f9eaa03 100644 --- a/packages/fiori3/src/components/Avatar/Avatar.karma.tsx +++ b/packages/main/src/components/Avatar/Avatar.karma.tsx @@ -1,5 +1,5 @@ import { mountThemedComponent } from '@shared/tests/utils'; -import { KeyCodes } from '@ui5-webcomponents-react/base'; +import { KeyCodes } from '@ui5/webcomponents-react-base'; import { expect, use } from 'chai'; import { matchSnapshot } from 'chai-karma-snapshot'; import React from 'react'; diff --git a/packages/fiori3/src/components/Avatar/demo.stories.tsx b/packages/main/src/components/Avatar/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Avatar/demo.stories.tsx rename to packages/main/src/components/Avatar/demo.stories.tsx diff --git a/packages/fiori3/src/components/Avatar/index.tsx b/packages/main/src/components/Avatar/index.tsx similarity index 97% rename from packages/fiori3/src/components/Avatar/index.tsx rename to packages/main/src/components/Avatar/index.tsx index 018d8cd7563..248d9248af2 100644 --- a/packages/fiori3/src/components/Avatar/index.tsx +++ b/packages/main/src/components/Avatar/index.tsx @@ -1,4 +1,4 @@ -import { Event, KeyCodes, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, KeyCodes, withStyles } from '@ui5/webcomponents-react-base'; import React, { CSSProperties, PureComponent } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/Bar/Bar.jss.ts b/packages/main/src/components/Bar/Bar.jss.ts similarity index 100% rename from packages/fiori3/src/components/Bar/Bar.jss.ts rename to packages/main/src/components/Bar/Bar.jss.ts diff --git a/packages/fiori3/src/components/Bar/Bar.test.tsx b/packages/main/src/components/Bar/Bar.test.tsx similarity index 100% rename from packages/fiori3/src/components/Bar/Bar.test.tsx rename to packages/main/src/components/Bar/Bar.test.tsx diff --git a/packages/fiori3/src/components/Bar/__snapshots__/Bar.test.tsx.snap b/packages/main/src/components/Bar/__snapshots__/Bar.test.tsx.snap similarity index 100% rename from packages/fiori3/src/components/Bar/__snapshots__/Bar.test.tsx.snap rename to packages/main/src/components/Bar/__snapshots__/Bar.test.tsx.snap diff --git a/packages/fiori3/src/components/Bar/demo.stories.tsx b/packages/main/src/components/Bar/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Bar/demo.stories.tsx rename to packages/main/src/components/Bar/demo.stories.tsx diff --git a/packages/fiori3/src/components/Bar/index.tsx b/packages/main/src/components/Bar/index.tsx similarity index 95% rename from packages/fiori3/src/components/Bar/index.tsx rename to packages/main/src/components/Bar/index.tsx index 85e31ed0444..6bd48347b68 100644 --- a/packages/fiori3/src/components/Bar/index.tsx +++ b/packages/main/src/components/Bar/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/Carousel/Carousel.jss.ts b/packages/main/src/components/Carousel/Carousel.jss.ts similarity index 95% rename from packages/fiori3/src/components/Carousel/Carousel.jss.ts rename to packages/main/src/components/Carousel/Carousel.jss.ts index 68a306fdca6..c33630175e6 100644 --- a/packages/fiori3/src/components/Carousel/Carousel.jss.ts +++ b/packages/main/src/components/Carousel/Carousel.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const styles = ({ theme, contentDensity, parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/Carousel/Carousel.karma.tsx b/packages/main/src/components/Carousel/Carousel.karma.tsx similarity index 100% rename from packages/fiori3/src/components/Carousel/Carousel.karma.tsx rename to packages/main/src/components/Carousel/Carousel.karma.tsx diff --git a/packages/fiori3/src/components/Carousel/CarouselPagination.jss.ts b/packages/main/src/components/Carousel/CarouselPagination.jss.ts similarity index 97% rename from packages/fiori3/src/components/Carousel/CarouselPagination.jss.ts rename to packages/main/src/components/Carousel/CarouselPagination.jss.ts index 8aa40b51fc8..d5b579ad8b8 100644 --- a/packages/fiori3/src/components/Carousel/CarouselPagination.jss.ts +++ b/packages/main/src/components/Carousel/CarouselPagination.jss.ts @@ -1,4 +1,4 @@ -import { HSLColor } from '@ui5-webcomponents-react/base'; +import { HSLColor } from '@ui5/webcomponents-react-base'; import { ZIndex } from '../../enums/ZIndex'; import { JSSTheme } from '../../interfaces/JSSTheme'; diff --git a/packages/fiori3/src/components/Carousel/CarouselPagination.tsx b/packages/main/src/components/Carousel/CarouselPagination.tsx similarity index 97% rename from packages/fiori3/src/components/Carousel/CarouselPagination.tsx rename to packages/main/src/components/Carousel/CarouselPagination.tsx index 14014108f20..4ab86504e95 100644 --- a/packages/fiori3/src/components/Carousel/CarouselPagination.tsx +++ b/packages/main/src/components/Carousel/CarouselPagination.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, Component } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CarouselArrowsPlacement } from '../../lib/CarouselArrowsPlacement'; diff --git a/packages/fiori3/src/components/Carousel/demo.stories.tsx b/packages/main/src/components/Carousel/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Carousel/demo.stories.tsx rename to packages/main/src/components/Carousel/demo.stories.tsx diff --git a/packages/fiori3/src/components/Carousel/index.tsx b/packages/main/src/components/Carousel/index.tsx similarity index 98% rename from packages/fiori3/src/components/Carousel/index.tsx rename to packages/main/src/components/Carousel/index.tsx index 3087602c54f..7e8f913ddb5 100644 --- a/packages/fiori3/src/components/Carousel/index.tsx +++ b/packages/main/src/components/Carousel/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, Component, CSSProperties, Fragment, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/FilterBar/FilterBar.jss.ts b/packages/main/src/components/FilterBar/FilterBar.jss.ts similarity index 97% rename from packages/fiori3/src/components/FilterBar/FilterBar.jss.ts rename to packages/main/src/components/FilterBar/FilterBar.jss.ts index ef1dee5e198..85b0e56211f 100644 --- a/packages/fiori3/src/components/FilterBar/FilterBar.jss.ts +++ b/packages/main/src/components/FilterBar/FilterBar.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const styles = ({ theme, contentDensity, parameters }: JSSTheme) => { diff --git a/packages/fiori3/src/components/FilterBar/FilterBar.karma.tsx b/packages/main/src/components/FilterBar/FilterBar.karma.tsx similarity index 100% rename from packages/fiori3/src/components/FilterBar/FilterBar.karma.tsx rename to packages/main/src/components/FilterBar/FilterBar.karma.tsx diff --git a/packages/fiori3/src/components/FilterBar/demo.stories.tsx b/packages/main/src/components/FilterBar/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/FilterBar/demo.stories.tsx rename to packages/main/src/components/FilterBar/demo.stories.tsx diff --git a/packages/fiori3/src/components/FilterBar/index.tsx b/packages/main/src/components/FilterBar/index.tsx similarity index 96% rename from packages/fiori3/src/components/FilterBar/index.tsx rename to packages/main/src/components/FilterBar/index.tsx index c29fd87e1ec..14c5ff6bad3 100644 --- a/packages/fiori3/src/components/FilterBar/index.tsx +++ b/packages/main/src/components/FilterBar/index.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/FilterItem/FilterItem.jss.ts b/packages/main/src/components/FilterItem/FilterItem.jss.ts similarity index 100% rename from packages/fiori3/src/components/FilterItem/FilterItem.jss.ts rename to packages/main/src/components/FilterItem/FilterItem.jss.ts diff --git a/packages/fiori3/src/components/FilterItem/index.tsx b/packages/main/src/components/FilterItem/index.tsx similarity index 97% rename from packages/fiori3/src/components/FilterItem/index.tsx rename to packages/main/src/components/FilterItem/index.tsx index 25cb066efe4..23e484bbcb9 100644 --- a/packages/fiori3/src/components/FilterItem/index.tsx +++ b/packages/main/src/components/FilterItem/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/FlexBox/FlexBox.test.tsx b/packages/main/src/components/FlexBox/FlexBox.test.tsx similarity index 100% rename from packages/fiori3/src/components/FlexBox/FlexBox.test.tsx rename to packages/main/src/components/FlexBox/FlexBox.test.tsx diff --git a/packages/fiori3/src/components/FlexBox/Flexbox.jss.ts b/packages/main/src/components/FlexBox/Flexbox.jss.ts similarity index 100% rename from packages/fiori3/src/components/FlexBox/Flexbox.jss.ts rename to packages/main/src/components/FlexBox/Flexbox.jss.ts diff --git a/packages/fiori3/src/components/FlexBox/index.tsx b/packages/main/src/components/FlexBox/index.tsx similarity index 97% rename from packages/fiori3/src/components/FlexBox/index.tsx rename to packages/main/src/components/FlexBox/index.tsx index d50a38d0abe..593230a1502 100644 --- a/packages/fiori3/src/components/FlexBox/index.tsx +++ b/packages/main/src/components/FlexBox/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, CSSProperties, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/Grid/Grid.jss.ts b/packages/main/src/components/Grid/Grid.jss.ts similarity index 100% rename from packages/fiori3/src/components/Grid/Grid.jss.ts rename to packages/main/src/components/Grid/Grid.jss.ts diff --git a/packages/fiori3/src/components/Grid/Grid.test.tsx b/packages/main/src/components/Grid/Grid.test.tsx similarity index 100% rename from packages/fiori3/src/components/Grid/Grid.test.tsx rename to packages/main/src/components/Grid/Grid.test.tsx diff --git a/packages/fiori3/src/components/Grid/__snapshots__/Grid.test.tsx.snap b/packages/main/src/components/Grid/__snapshots__/Grid.test.tsx.snap similarity index 100% rename from packages/fiori3/src/components/Grid/__snapshots__/Grid.test.tsx.snap rename to packages/main/src/components/Grid/__snapshots__/Grid.test.tsx.snap diff --git a/packages/fiori3/src/components/Grid/index.tsx b/packages/main/src/components/Grid/index.tsx similarity index 98% rename from packages/fiori3/src/components/Grid/index.tsx rename to packages/main/src/components/Grid/index.tsx index 02b89af00d0..a86c408d221 100644 --- a/packages/fiori3/src/components/Grid/index.tsx +++ b/packages/main/src/components/Grid/index.tsx @@ -1,4 +1,4 @@ -import { Device, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Device, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, Component, CSSProperties, ReactElement, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/MessageBox/MessageBox.jss.ts b/packages/main/src/components/MessageBox/MessageBox.jss.ts similarity index 98% rename from packages/fiori3/src/components/MessageBox/MessageBox.jss.ts rename to packages/main/src/components/MessageBox/MessageBox.jss.ts index f24d5ba1925..68aaa225d00 100644 --- a/packages/fiori3/src/components/MessageBox/MessageBox.jss.ts +++ b/packages/main/src/components/MessageBox/MessageBox.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { ZIndex } from '../../enums/ZIndex'; import { JSSTheme } from '../../interfaces/JSSTheme'; import { ContentDensity } from '../../lib/ContentDensity'; diff --git a/packages/fiori3/src/components/MessageBox/MessageBox.karma.tsx b/packages/main/src/components/MessageBox/MessageBox.karma.tsx similarity index 100% rename from packages/fiori3/src/components/MessageBox/MessageBox.karma.tsx rename to packages/main/src/components/MessageBox/MessageBox.karma.tsx diff --git a/packages/fiori3/src/components/MessageBox/MessageBoxButton.tsx b/packages/main/src/components/MessageBox/MessageBoxButton.tsx similarity index 100% rename from packages/fiori3/src/components/MessageBox/MessageBoxButton.tsx rename to packages/main/src/components/MessageBox/MessageBoxButton.tsx diff --git a/packages/fiori3/src/components/MessageBox/demo.stories.tsx b/packages/main/src/components/MessageBox/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/MessageBox/demo.stories.tsx rename to packages/main/src/components/MessageBox/demo.stories.tsx diff --git a/packages/fiori3/src/components/MessageBox/index.tsx b/packages/main/src/components/MessageBox/index.tsx similarity index 98% rename from packages/fiori3/src/components/MessageBox/index.tsx rename to packages/main/src/components/MessageBox/index.tsx index f02f55940ba..ad7d9d52544 100644 --- a/packages/fiori3/src/components/MessageBox/index.tsx +++ b/packages/main/src/components/MessageBox/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { isValidElement, PureComponent, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/MessageToast/MessageToast.jss.ts b/packages/main/src/components/MessageToast/MessageToast.jss.ts similarity index 93% rename from packages/fiori3/src/components/MessageToast/MessageToast.jss.ts rename to packages/main/src/components/MessageToast/MessageToast.jss.ts index a2542be8a20..d7db2b86636 100644 --- a/packages/fiori3/src/components/MessageToast/MessageToast.jss.ts +++ b/packages/main/src/components/MessageToast/MessageToast.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; export default ({ parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/MessageToast/MessageToast.karma.tsx b/packages/main/src/components/MessageToast/MessageToast.karma.tsx similarity index 95% rename from packages/fiori3/src/components/MessageToast/MessageToast.karma.tsx rename to packages/main/src/components/MessageToast/MessageToast.karma.tsx index 03cfd97c4a7..6940645fc9b 100644 --- a/packages/fiori3/src/components/MessageToast/MessageToast.karma.tsx +++ b/packages/main/src/components/MessageToast/MessageToast.karma.tsx @@ -1,4 +1,4 @@ -import { bootstrap } from '@ui5-webcomponents-react/base'; +import { bootstrap } from '@ui5/webcomponents-react-base'; import { expect } from 'chai'; import sinon from 'sinon'; import { ExtendedWindow } from '../../interfaces/ExtendedWindow'; diff --git a/packages/fiori3/src/components/MessageToast/demo.stories.tsx b/packages/main/src/components/MessageToast/demo.stories.tsx similarity index 85% rename from packages/fiori3/src/components/MessageToast/demo.stories.tsx rename to packages/main/src/components/MessageToast/demo.stories.tsx index 94a19e60eb1..11b696665c0 100644 --- a/packages/fiori3/src/components/MessageToast/demo.stories.tsx +++ b/packages/main/src/components/MessageToast/demo.stories.tsx @@ -46,25 +46,25 @@ storiesOf('Components | MessageToast', module).add( propTablesExclude: [ThemeProvider, Button], text: ` #### Success Message Toast: -import { MessageToast } from '@ui5-webcomponents-react/fiori3'; +import { MessageToast } from '@ui5/webcomponents-react'; MessageToast.success('Hello Success Message Toast'); #### Warning Message Toast: -import { MessageToast } from '@ui5-webcomponents-react/fiori3'; +import { MessageToast } from '@ui5/webcomponents-react'; MessageToast.warning('Hello Warning Message Toast'); #### Error Message Toast: -import { MessageToast } from '@ui5-webcomponents-react/fiori3'; +import { MessageToast } from '@ui5/webcomponents-react'; MessageToast.error('Hello Error Message Toast'); #### Generic Message Toast: -import { MessageToast } from '@ui5-webcomponents-react/fiori3'; +import { MessageToast } from '@ui5/webcomponents-react'; MessageToast.show('Hello Generic Message Toast'); diff --git a/packages/fiori3/src/components/MessageToast/index.tsx b/packages/main/src/components/MessageToast/index.tsx similarity index 97% rename from packages/fiori3/src/components/MessageToast/index.tsx rename to packages/main/src/components/MessageToast/index.tsx index 977240d8d20..3de19a4ee30 100644 --- a/packages/fiori3/src/components/MessageToast/index.tsx +++ b/packages/main/src/components/MessageToast/index.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent } from 'react'; import { createPortal } from 'react-dom'; import { toast, ToastContainer } from 'react-toastify'; diff --git a/packages/fiori3/src/components/ObjectPage/DemoImage.png b/packages/main/src/components/ObjectPage/DemoImage.png similarity index 100% rename from packages/fiori3/src/components/ObjectPage/DemoImage.png rename to packages/main/src/components/ObjectPage/DemoImage.png diff --git a/packages/fiori3/src/components/ObjectPage/EmptyIdPropException.test.ts b/packages/main/src/components/ObjectPage/EmptyIdPropException.test.ts similarity index 100% rename from packages/fiori3/src/components/ObjectPage/EmptyIdPropException.test.ts rename to packages/main/src/components/ObjectPage/EmptyIdPropException.test.ts diff --git a/packages/fiori3/src/components/ObjectPage/EmptyIdPropException.ts b/packages/main/src/components/ObjectPage/EmptyIdPropException.ts similarity index 100% rename from packages/fiori3/src/components/ObjectPage/EmptyIdPropException.ts rename to packages/main/src/components/ObjectPage/EmptyIdPropException.ts diff --git a/packages/fiori3/src/components/ObjectPage/ObjectPage.jss.ts b/packages/main/src/components/ObjectPage/ObjectPage.jss.ts similarity index 98% rename from packages/fiori3/src/components/ObjectPage/ObjectPage.jss.ts rename to packages/main/src/components/ObjectPage/ObjectPage.jss.ts index 8791d064c74..52e703089bc 100644 --- a/packages/fiori3/src/components/ObjectPage/ObjectPage.jss.ts +++ b/packages/main/src/components/ObjectPage/ObjectPage.jss.ts @@ -1,4 +1,4 @@ -import { fonts, HSLColor } from '@ui5-webcomponents-react/base'; +import { fonts, HSLColor } from '@ui5/webcomponents-react-base'; import { ZIndex } from '../../enums/ZIndex'; import { JSSTheme } from '../../interfaces/JSSTheme'; diff --git a/packages/fiori3/src/components/ObjectPage/ObjectPage.karma.tsx b/packages/main/src/components/ObjectPage/ObjectPage.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectPage/ObjectPage.karma.tsx rename to packages/main/src/components/ObjectPage/ObjectPage.karma.tsx diff --git a/packages/fiori3/src/components/ObjectPage/ObjectPageAnchor.tsx b/packages/main/src/components/ObjectPage/ObjectPageAnchor.tsx similarity index 98% rename from packages/fiori3/src/components/ObjectPage/ObjectPageAnchor.tsx rename to packages/main/src/components/ObjectPage/ObjectPageAnchor.tsx index a5d735a8cec..38c5a9eb0c7 100644 --- a/packages/fiori3/src/components/ObjectPage/ObjectPageAnchor.tsx +++ b/packages/main/src/components/ObjectPage/ObjectPageAnchor.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper } from '@ui5/webcomponents-react-base'; import React, { Component } from 'react'; import { Link } from 'react-scroll'; import { ObjectWithVariableKeys } from '../../interfaces/ObjectWithVariableKeys'; diff --git a/packages/fiori3/src/components/ObjectPage/demo.stories.tsx b/packages/main/src/components/ObjectPage/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectPage/demo.stories.tsx rename to packages/main/src/components/ObjectPage/demo.stories.tsx diff --git a/packages/fiori3/src/components/ObjectPage/index.tsx b/packages/main/src/components/ObjectPage/index.tsx similarity index 99% rename from packages/fiori3/src/components/ObjectPage/index.tsx rename to packages/main/src/components/ObjectPage/index.tsx index ba4c5093642..59f140be0bd 100644 --- a/packages/fiori3/src/components/ObjectPage/index.tsx +++ b/packages/main/src/components/ObjectPage/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, cloneElement, PureComponent, ReactElement, ReactNode, ReactNodeArray } from 'react'; import { scroller } from 'react-scroll'; import { ClassProps } from '../../interfaces/ClassProps'; diff --git a/packages/fiori3/src/components/ObjectPageSection/ObjectPageSection.jss.ts b/packages/main/src/components/ObjectPageSection/ObjectPageSection.jss.ts similarity index 94% rename from packages/fiori3/src/components/ObjectPageSection/ObjectPageSection.jss.ts rename to packages/main/src/components/ObjectPageSection/ObjectPageSection.jss.ts index e4dc5582580..f7dd4b4a3a7 100644 --- a/packages/fiori3/src/components/ObjectPageSection/ObjectPageSection.jss.ts +++ b/packages/main/src/components/ObjectPageSection/ObjectPageSection.jss.ts @@ -1,4 +1,4 @@ -import { fonts, HSLColor } from '@ui5-webcomponents-react/base'; +import { fonts, HSLColor } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const styles = ({ theme, parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/ObjectPageSection/ObjectPageSection.karma.tsx b/packages/main/src/components/ObjectPageSection/ObjectPageSection.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectPageSection/ObjectPageSection.karma.tsx rename to packages/main/src/components/ObjectPageSection/ObjectPageSection.karma.tsx diff --git a/packages/fiori3/src/components/ObjectPageSection/index.tsx b/packages/main/src/components/ObjectPageSection/index.tsx similarity index 95% rename from packages/fiori3/src/components/ObjectPageSection/index.tsx rename to packages/main/src/components/ObjectPageSection/index.tsx index d8b0abd188c..e7a54c8801e 100644 --- a/packages/fiori3/src/components/ObjectPageSection/index.tsx +++ b/packages/main/src/components/ObjectPageSection/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/ObjectPageSubSection/ObjectPageSubSection.karma.tsx b/packages/main/src/components/ObjectPageSubSection/ObjectPageSubSection.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectPageSubSection/ObjectPageSubSection.karma.tsx rename to packages/main/src/components/ObjectPageSubSection/ObjectPageSubSection.karma.tsx diff --git a/packages/fiori3/src/components/ObjectPageSubSection/index.tsx b/packages/main/src/components/ObjectPageSubSection/index.tsx similarity index 98% rename from packages/fiori3/src/components/ObjectPageSubSection/index.tsx rename to packages/main/src/components/ObjectPageSubSection/index.tsx index 588280f8d6e..be0fb082c2e 100644 --- a/packages/fiori3/src/components/ObjectPageSubSection/index.tsx +++ b/packages/main/src/components/ObjectPageSubSection/index.tsx @@ -1,4 +1,4 @@ -import { fonts, HSLColor, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { fonts, HSLColor, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent, ReactNode, ReactNodeArray } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/ObjectStatus/ObjectStatus.jss.ts b/packages/main/src/components/ObjectStatus/ObjectStatus.jss.ts similarity index 95% rename from packages/fiori3/src/components/ObjectStatus/ObjectStatus.jss.ts rename to packages/main/src/components/ObjectStatus/ObjectStatus.jss.ts index f68b028c657..5021f5d8e73 100644 --- a/packages/fiori3/src/components/ObjectStatus/ObjectStatus.jss.ts +++ b/packages/main/src/components/ObjectStatus/ObjectStatus.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; const styles = ({ theme, contentDensity, parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/ObjectStatus/ObjectStatus.karma.tsx b/packages/main/src/components/ObjectStatus/ObjectStatus.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectStatus/ObjectStatus.karma.tsx rename to packages/main/src/components/ObjectStatus/ObjectStatus.karma.tsx diff --git a/packages/fiori3/src/components/ObjectStatus/demo.stories.tsx b/packages/main/src/components/ObjectStatus/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/ObjectStatus/demo.stories.tsx rename to packages/main/src/components/ObjectStatus/demo.stories.tsx diff --git a/packages/fiori3/src/components/ObjectStatus/index.tsx b/packages/main/src/components/ObjectStatus/index.tsx similarity index 96% rename from packages/fiori3/src/components/ObjectStatus/index.tsx rename to packages/main/src/components/ObjectStatus/index.tsx index 0c176f9b839..8fc2eb917b1 100644 --- a/packages/fiori3/src/components/ObjectStatus/index.tsx +++ b/packages/main/src/components/ObjectStatus/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { FC, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/Page/Page.jss.ts b/packages/main/src/components/Page/Page.jss.ts similarity index 100% rename from packages/fiori3/src/components/Page/Page.jss.ts rename to packages/main/src/components/Page/Page.jss.ts diff --git a/packages/fiori3/src/components/Page/demo.stories.tsx b/packages/main/src/components/Page/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Page/demo.stories.tsx rename to packages/main/src/components/Page/demo.stories.tsx diff --git a/packages/fiori3/src/components/Page/index.tsx b/packages/main/src/components/Page/index.tsx similarity index 97% rename from packages/fiori3/src/components/Page/index.tsx rename to packages/main/src/components/Page/index.tsx index 23843d6d69e..6dae991de1d 100644 --- a/packages/fiori3/src/components/Page/index.tsx +++ b/packages/main/src/components/Page/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, ReactElement, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/Page/page.karma.tsx b/packages/main/src/components/Page/page.karma.tsx similarity index 100% rename from packages/fiori3/src/components/Page/page.karma.tsx rename to packages/main/src/components/Page/page.karma.tsx diff --git a/packages/fiori3/src/components/ProgressIndicator/ProgressIndicator.jss.ts b/packages/main/src/components/ProgressIndicator/ProgressIndicator.jss.ts similarity index 97% rename from packages/fiori3/src/components/ProgressIndicator/ProgressIndicator.jss.ts rename to packages/main/src/components/ProgressIndicator/ProgressIndicator.jss.ts index b78f37fe69f..52aa514eebd 100644 --- a/packages/fiori3/src/components/ProgressIndicator/ProgressIndicator.jss.ts +++ b/packages/main/src/components/ProgressIndicator/ProgressIndicator.jss.ts @@ -1,4 +1,4 @@ -import { fonts, HSLColor } from '@ui5-webcomponents-react/base'; +import { fonts, HSLColor } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; import { ValueState } from '../../lib/ValueState'; diff --git a/packages/fiori3/src/components/ProgressIndicator/ProgressIndicator.karma.tsx b/packages/main/src/components/ProgressIndicator/ProgressIndicator.karma.tsx similarity index 100% rename from packages/fiori3/src/components/ProgressIndicator/ProgressIndicator.karma.tsx rename to packages/main/src/components/ProgressIndicator/ProgressIndicator.karma.tsx diff --git a/packages/fiori3/src/components/ProgressIndicator/demo.stories.tsx b/packages/main/src/components/ProgressIndicator/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/ProgressIndicator/demo.stories.tsx rename to packages/main/src/components/ProgressIndicator/demo.stories.tsx diff --git a/packages/fiori3/src/components/ProgressIndicator/index.tsx b/packages/main/src/components/ProgressIndicator/index.tsx similarity index 97% rename from packages/fiori3/src/components/ProgressIndicator/index.tsx rename to packages/main/src/components/ProgressIndicator/index.tsx index 7e3d8021932..f17ade49c9c 100644 --- a/packages/fiori3/src/components/ProgressIndicator/index.tsx +++ b/packages/main/src/components/ProgressIndicator/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { PureComponent } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/SegmentedButton/SegmentedButton.karma.tsx b/packages/main/src/components/SegmentedButton/SegmentedButton.karma.tsx similarity index 100% rename from packages/fiori3/src/components/SegmentedButton/SegmentedButton.karma.tsx rename to packages/main/src/components/SegmentedButton/SegmentedButton.karma.tsx diff --git a/packages/fiori3/src/components/SegmentedButton/demo.stories.tsx b/packages/main/src/components/SegmentedButton/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/SegmentedButton/demo.stories.tsx rename to packages/main/src/components/SegmentedButton/demo.stories.tsx diff --git a/packages/fiori3/src/components/SegmentedButton/index.tsx b/packages/main/src/components/SegmentedButton/index.tsx similarity index 98% rename from packages/fiori3/src/components/SegmentedButton/index.tsx rename to packages/main/src/components/SegmentedButton/index.tsx index e5caeceace7..e5a813f5878 100644 --- a/packages/fiori3/src/components/SegmentedButton/index.tsx +++ b/packages/main/src/components/SegmentedButton/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { Children, cloneElement, Component, CSSProperties, ReactElement } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts b/packages/main/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts similarity index 97% rename from packages/fiori3/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts rename to packages/main/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts index 2bde44b5011..931641a4371 100644 --- a/packages/fiori3/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts +++ b/packages/main/src/components/SegmentedButtonItem/SegmentedButtonItem.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; import { ContentDensity } from '../../lib/ContentDensity'; diff --git a/packages/fiori3/src/components/SegmentedButtonItem/SegmentedButtonItem.karma.tsx b/packages/main/src/components/SegmentedButtonItem/SegmentedButtonItem.karma.tsx similarity index 100% rename from packages/fiori3/src/components/SegmentedButtonItem/SegmentedButtonItem.karma.tsx rename to packages/main/src/components/SegmentedButtonItem/SegmentedButtonItem.karma.tsx diff --git a/packages/fiori3/src/components/SegmentedButtonItem/index.tsx b/packages/main/src/components/SegmentedButtonItem/index.tsx similarity index 96% rename from packages/fiori3/src/components/SegmentedButtonItem/index.tsx rename to packages/main/src/components/SegmentedButtonItem/index.tsx index ac3a7fce82a..5aa5c7f502b 100644 --- a/packages/fiori3/src/components/SegmentedButtonItem/index.tsx +++ b/packages/main/src/components/SegmentedButtonItem/index.tsx @@ -1,4 +1,4 @@ -import { Event, StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { CSSProperties, PureComponent } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/Spinner/Spinner.jss.ts b/packages/main/src/components/Spinner/Spinner.jss.ts similarity index 100% rename from packages/fiori3/src/components/Spinner/Spinner.jss.ts rename to packages/main/src/components/Spinner/Spinner.jss.ts diff --git a/packages/fiori3/src/components/Spinner/Spinner.test.tsx b/packages/main/src/components/Spinner/Spinner.test.tsx similarity index 100% rename from packages/fiori3/src/components/Spinner/Spinner.test.tsx rename to packages/main/src/components/Spinner/Spinner.test.tsx diff --git a/packages/fiori3/src/components/Spinner/__snapshots__/Spinner.test.tsx.snap b/packages/main/src/components/Spinner/__snapshots__/Spinner.test.tsx.snap similarity index 100% rename from packages/fiori3/src/components/Spinner/__snapshots__/Spinner.test.tsx.snap rename to packages/main/src/components/Spinner/__snapshots__/Spinner.test.tsx.snap diff --git a/packages/fiori3/src/components/Spinner/demo.stories.tsx b/packages/main/src/components/Spinner/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Spinner/demo.stories.tsx rename to packages/main/src/components/Spinner/demo.stories.tsx diff --git a/packages/fiori3/src/components/Spinner/index.tsx b/packages/main/src/components/Spinner/index.tsx similarity index 93% rename from packages/fiori3/src/components/Spinner/index.tsx rename to packages/main/src/components/Spinner/index.tsx index 997afc322fa..8484bbe0453 100644 --- a/packages/fiori3/src/components/Spinner/index.tsx +++ b/packages/main/src/components/Spinner/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { FC } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { Fiori3CommonProps } from '../../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/components/Text/Text.jss.ts b/packages/main/src/components/Text/Text.jss.ts similarity index 92% rename from packages/fiori3/src/components/Text/Text.jss.ts rename to packages/main/src/components/Text/Text.jss.ts index ec06717f531..01372d439c1 100644 --- a/packages/fiori3/src/components/Text/Text.jss.ts +++ b/packages/main/src/components/Text/Text.jss.ts @@ -1,4 +1,4 @@ -import { fonts } from '@ui5-webcomponents-react/base'; +import { fonts } from '@ui5/webcomponents-react-base'; import { JSSTheme } from '../../interfaces/JSSTheme'; export const TextStyles = ({ parameters }: JSSTheme) => ({ diff --git a/packages/fiori3/src/components/Text/Text.karma.tsx b/packages/main/src/components/Text/Text.karma.tsx similarity index 100% rename from packages/fiori3/src/components/Text/Text.karma.tsx rename to packages/main/src/components/Text/Text.karma.tsx diff --git a/packages/fiori3/src/components/Text/demo.stories.tsx b/packages/main/src/components/Text/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/Text/demo.stories.tsx rename to packages/main/src/components/Text/demo.stories.tsx diff --git a/packages/fiori3/src/components/Text/index.tsx b/packages/main/src/components/Text/index.tsx similarity index 95% rename from packages/fiori3/src/components/Text/index.tsx rename to packages/main/src/components/Text/index.tsx index c420a7c6bc4..b73bbc9fb7b 100644 --- a/packages/fiori3/src/components/Text/index.tsx +++ b/packages/main/src/components/Text/index.tsx @@ -1,4 +1,4 @@ -import { StyleClassHelper, withStyles } from '@ui5-webcomponents-react/base'; +import { StyleClassHelper, withStyles } from '@ui5/webcomponents-react-base'; import React, { CSSProperties, FC, ReactNode } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/components/ThemeProvider/ThemeProvider.karma.tsx b/packages/main/src/components/ThemeProvider/ThemeProvider.karma.tsx similarity index 89% rename from packages/fiori3/src/components/ThemeProvider/ThemeProvider.karma.tsx rename to packages/main/src/components/ThemeProvider/ThemeProvider.karma.tsx index bf17edc6989..64063893f6e 100644 --- a/packages/fiori3/src/components/ThemeProvider/ThemeProvider.karma.tsx +++ b/packages/main/src/components/ThemeProvider/ThemeProvider.karma.tsx @@ -1,4 +1,4 @@ -import { withStyles } from '@ui5-webcomponents-react/base'; +import { withStyles } from '@ui5/webcomponents-react-base'; import { expect } from 'chai'; import { mount } from 'enzyme'; import React from 'react'; diff --git a/packages/fiori3/src/components/ThemeProvider/index.tsx b/packages/main/src/components/ThemeProvider/index.tsx similarity index 95% rename from packages/fiori3/src/components/ThemeProvider/index.tsx rename to packages/main/src/components/ThemeProvider/index.tsx index fae411af374..6ac04ba84b0 100644 --- a/packages/fiori3/src/components/ThemeProvider/index.tsx +++ b/packages/main/src/components/ThemeProvider/index.tsx @@ -1,4 +1,4 @@ -import { sap_fiori_3 } from '@ui5-webcomponents-react/base'; +import { sap_fiori_3 } from '@ui5/webcomponents-react-base'; import { getCompactSize, getTheme } from '@ui5/webcomponents-base/src/Configuration'; import React, { Fragment, PureComponent, ReactNode } from 'react'; import { jss, ThemeProvider as ReactJssThemeProvider } from 'react-jss'; diff --git a/packages/fiori3/src/components/VariantManagement/VariantManagement.karma.tsx b/packages/main/src/components/VariantManagement/VariantManagement.karma.tsx similarity index 100% rename from packages/fiori3/src/components/VariantManagement/VariantManagement.karma.tsx rename to packages/main/src/components/VariantManagement/VariantManagement.karma.tsx diff --git a/packages/fiori3/src/components/VariantManagement/demo.stories.tsx b/packages/main/src/components/VariantManagement/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/components/VariantManagement/demo.stories.tsx rename to packages/main/src/components/VariantManagement/demo.stories.tsx diff --git a/packages/fiori3/src/components/VariantManagement/index.tsx b/packages/main/src/components/VariantManagement/index.tsx similarity index 98% rename from packages/fiori3/src/components/VariantManagement/index.tsx rename to packages/main/src/components/VariantManagement/index.tsx index 095fd4d9a6b..0531c3506b1 100644 --- a/packages/fiori3/src/components/VariantManagement/index.tsx +++ b/packages/main/src/components/VariantManagement/index.tsx @@ -1,4 +1,4 @@ -import { Event, withStyles } from '@ui5-webcomponents-react/base'; +import { Event, withStyles } from '@ui5/webcomponents-react-base'; import React, { Component, ReactElement } from 'react'; import { ClassProps } from '../../interfaces/ClassProps'; import { CommonProps } from '../../interfaces/CommonProps'; diff --git a/packages/fiori3/src/enums/AvatarShape.ts b/packages/main/src/enums/AvatarShape.ts similarity index 100% rename from packages/fiori3/src/enums/AvatarShape.ts rename to packages/main/src/enums/AvatarShape.ts diff --git a/packages/fiori3/src/enums/AvatarSize.ts b/packages/main/src/enums/AvatarSize.ts similarity index 100% rename from packages/fiori3/src/enums/AvatarSize.ts rename to packages/main/src/enums/AvatarSize.ts diff --git a/packages/fiori3/src/enums/BusyIndicatorType.ts b/packages/main/src/enums/BusyIndicatorType.ts similarity index 100% rename from packages/fiori3/src/enums/BusyIndicatorType.ts rename to packages/main/src/enums/BusyIndicatorType.ts diff --git a/packages/fiori3/src/enums/ButtonDesign.ts b/packages/main/src/enums/ButtonDesign.ts similarity index 100% rename from packages/fiori3/src/enums/ButtonDesign.ts rename to packages/main/src/enums/ButtonDesign.ts diff --git a/packages/fiori3/src/enums/CalendarType.ts b/packages/main/src/enums/CalendarType.ts similarity index 100% rename from packages/fiori3/src/enums/CalendarType.ts rename to packages/main/src/enums/CalendarType.ts diff --git a/packages/fiori3/src/enums/CarouselArrowsPlacement.ts b/packages/main/src/enums/CarouselArrowsPlacement.ts similarity index 100% rename from packages/fiori3/src/enums/CarouselArrowsPlacement.ts rename to packages/main/src/enums/CarouselArrowsPlacement.ts diff --git a/packages/fiori3/src/enums/ContentDensity.ts b/packages/main/src/enums/ContentDensity.ts similarity index 100% rename from packages/fiori3/src/enums/ContentDensity.ts rename to packages/main/src/enums/ContentDensity.ts diff --git a/packages/fiori3/src/enums/DeviationIndicator.ts b/packages/main/src/enums/DeviationIndicator.ts similarity index 100% rename from packages/fiori3/src/enums/DeviationIndicator.ts rename to packages/main/src/enums/DeviationIndicator.ts diff --git a/packages/fiori3/src/enums/FilterType.ts b/packages/main/src/enums/FilterType.ts similarity index 100% rename from packages/fiori3/src/enums/FilterType.ts rename to packages/main/src/enums/FilterType.ts diff --git a/packages/fiori3/src/enums/InputType.ts b/packages/main/src/enums/InputType.ts similarity index 100% rename from packages/fiori3/src/enums/InputType.ts rename to packages/main/src/enums/InputType.ts diff --git a/packages/fiori3/src/enums/LinkDesign.ts b/packages/main/src/enums/LinkDesign.ts similarity index 100% rename from packages/fiori3/src/enums/LinkDesign.ts rename to packages/main/src/enums/LinkDesign.ts diff --git a/packages/fiori3/src/enums/ListItemTypes.ts b/packages/main/src/enums/ListItemTypes.ts similarity index 100% rename from packages/fiori3/src/enums/ListItemTypes.ts rename to packages/main/src/enums/ListItemTypes.ts diff --git a/packages/fiori3/src/enums/ListMode.ts b/packages/main/src/enums/ListMode.ts similarity index 100% rename from packages/fiori3/src/enums/ListMode.ts rename to packages/main/src/enums/ListMode.ts diff --git a/packages/fiori3/src/enums/ListSeparators.ts b/packages/main/src/enums/ListSeparators.ts similarity index 100% rename from packages/fiori3/src/enums/ListSeparators.ts rename to packages/main/src/enums/ListSeparators.ts diff --git a/packages/fiori3/src/enums/MessageStripType.ts b/packages/main/src/enums/MessageStripType.ts similarity index 100% rename from packages/fiori3/src/enums/MessageStripType.ts rename to packages/main/src/enums/MessageStripType.ts diff --git a/packages/fiori3/src/enums/ObjectPageMode.ts b/packages/main/src/enums/ObjectPageMode.ts similarity index 100% rename from packages/fiori3/src/enums/ObjectPageMode.ts rename to packages/main/src/enums/ObjectPageMode.ts diff --git a/packages/fiori3/src/enums/PageBackgroundDesign.ts b/packages/main/src/enums/PageBackgroundDesign.ts similarity index 100% rename from packages/fiori3/src/enums/PageBackgroundDesign.ts rename to packages/main/src/enums/PageBackgroundDesign.ts diff --git a/packages/fiori3/src/enums/PanelAccessibleRoles.ts b/packages/main/src/enums/PanelAccessibleRoles.ts similarity index 100% rename from packages/fiori3/src/enums/PanelAccessibleRoles.ts rename to packages/main/src/enums/PanelAccessibleRoles.ts diff --git a/packages/fiori3/src/enums/PlacementType.ts b/packages/main/src/enums/PlacementType.ts similarity index 100% rename from packages/fiori3/src/enums/PlacementType.ts rename to packages/main/src/enums/PlacementType.ts diff --git a/packages/fiori3/src/enums/PopoverHorizontalAlign.ts b/packages/main/src/enums/PopoverHorizontalAlign.ts similarity index 100% rename from packages/fiori3/src/enums/PopoverHorizontalAlign.ts rename to packages/main/src/enums/PopoverHorizontalAlign.ts diff --git a/packages/fiori3/src/enums/PopoverVerticalAlign.ts b/packages/main/src/enums/PopoverVerticalAlign.ts similarity index 100% rename from packages/fiori3/src/enums/PopoverVerticalAlign.ts rename to packages/main/src/enums/PopoverVerticalAlign.ts diff --git a/packages/fiori3/src/enums/SearchFunctions.ts b/packages/main/src/enums/SearchFunctions.ts similarity index 100% rename from packages/fiori3/src/enums/SearchFunctions.ts rename to packages/main/src/enums/SearchFunctions.ts diff --git a/packages/fiori3/src/enums/SemanticColor.ts b/packages/main/src/enums/SemanticColor.ts similarity index 100% rename from packages/fiori3/src/enums/SemanticColor.ts rename to packages/main/src/enums/SemanticColor.ts diff --git a/packages/fiori3/src/enums/Size.ts b/packages/main/src/enums/Size.ts similarity index 100% rename from packages/fiori3/src/enums/Size.ts rename to packages/main/src/enums/Size.ts diff --git a/packages/fiori3/src/enums/TabContainerHeaderMode.ts b/packages/main/src/enums/TabContainerHeaderMode.ts similarity index 100% rename from packages/fiori3/src/enums/TabContainerHeaderMode.ts rename to packages/main/src/enums/TabContainerHeaderMode.ts diff --git a/packages/fiori3/src/enums/TabDesignMode.ts b/packages/main/src/enums/TabDesignMode.ts similarity index 100% rename from packages/fiori3/src/enums/TabDesignMode.ts rename to packages/main/src/enums/TabDesignMode.ts diff --git a/packages/fiori3/src/enums/TextAlign.ts b/packages/main/src/enums/TextAlign.ts similarity index 100% rename from packages/fiori3/src/enums/TextAlign.ts rename to packages/main/src/enums/TextAlign.ts diff --git a/packages/fiori3/src/enums/Themes.ts b/packages/main/src/enums/Themes.ts similarity index 100% rename from packages/fiori3/src/enums/Themes.ts rename to packages/main/src/enums/Themes.ts diff --git a/packages/fiori3/src/enums/TitleLevel.ts b/packages/main/src/enums/TitleLevel.ts similarity index 100% rename from packages/fiori3/src/enums/TitleLevel.ts rename to packages/main/src/enums/TitleLevel.ts diff --git a/packages/fiori3/src/enums/ValueState.ts b/packages/main/src/enums/ValueState.ts similarity index 100% rename from packages/fiori3/src/enums/ValueState.ts rename to packages/main/src/enums/ValueState.ts diff --git a/packages/fiori3/src/enums/VerticalAlign.ts b/packages/main/src/enums/VerticalAlign.ts similarity index 100% rename from packages/fiori3/src/enums/VerticalAlign.ts rename to packages/main/src/enums/VerticalAlign.ts diff --git a/packages/fiori3/src/enums/ZIndex.ts b/packages/main/src/enums/ZIndex.ts similarity index 100% rename from packages/fiori3/src/enums/ZIndex.ts rename to packages/main/src/enums/ZIndex.ts diff --git a/packages/fiori3/src/exceptions/UnknownFlavourException.test.ts b/packages/main/src/exceptions/UnknownFlavourException.test.ts similarity index 100% rename from packages/fiori3/src/exceptions/UnknownFlavourException.test.ts rename to packages/main/src/exceptions/UnknownFlavourException.test.ts diff --git a/packages/fiori3/src/exceptions/UnknownFlavourException.ts b/packages/main/src/exceptions/UnknownFlavourException.ts similarity index 100% rename from packages/fiori3/src/exceptions/UnknownFlavourException.ts rename to packages/main/src/exceptions/UnknownFlavourException.ts diff --git a/packages/fiori3/src/index.ts b/packages/main/src/index.ts similarity index 100% rename from packages/fiori3/src/index.ts rename to packages/main/src/index.ts diff --git a/packages/fiori3/src/interfaces/ClassProps.ts b/packages/main/src/interfaces/ClassProps.ts similarity index 100% rename from packages/fiori3/src/interfaces/ClassProps.ts rename to packages/main/src/interfaces/ClassProps.ts diff --git a/packages/fiori3/src/interfaces/CommonProps.ts b/packages/main/src/interfaces/CommonProps.ts similarity index 100% rename from packages/fiori3/src/interfaces/CommonProps.ts rename to packages/main/src/interfaces/CommonProps.ts diff --git a/packages/fiori3/src/interfaces/DynamicObjectList.ts b/packages/main/src/interfaces/DynamicObjectList.ts similarity index 100% rename from packages/fiori3/src/interfaces/DynamicObjectList.ts rename to packages/main/src/interfaces/DynamicObjectList.ts diff --git a/packages/fiori3/src/interfaces/ExtendedWindow.ts b/packages/main/src/interfaces/ExtendedWindow.ts similarity index 100% rename from packages/fiori3/src/interfaces/ExtendedWindow.ts rename to packages/main/src/interfaces/ExtendedWindow.ts diff --git a/packages/fiori3/src/interfaces/Fiori3CommonProps.ts b/packages/main/src/interfaces/Fiori3CommonProps.ts similarity index 100% rename from packages/fiori3/src/interfaces/Fiori3CommonProps.ts rename to packages/main/src/interfaces/Fiori3CommonProps.ts diff --git a/packages/fiori3/src/interfaces/InputBaseItemType.ts b/packages/main/src/interfaces/InputBaseItemType.ts similarity index 100% rename from packages/fiori3/src/interfaces/InputBaseItemType.ts rename to packages/main/src/interfaces/InputBaseItemType.ts diff --git a/packages/fiori3/src/interfaces/JSSTheme.ts b/packages/main/src/interfaces/JSSTheme.ts similarity index 77% rename from packages/fiori3/src/interfaces/JSSTheme.ts rename to packages/main/src/interfaces/JSSTheme.ts index 9604994643e..0fc1444fbc5 100644 --- a/packages/fiori3/src/interfaces/JSSTheme.ts +++ b/packages/main/src/interfaces/JSSTheme.ts @@ -1,4 +1,4 @@ -import { sap_fiori_3 } from '@ui5-webcomponents-react/base'; +import { sap_fiori_3 } from '@ui5/webcomponents-react-base'; import { ContentDensity } from '../enums/ContentDensity'; import { Themes } from '../enums/Themes'; diff --git a/packages/fiori3/src/interfaces/ListItemShape.ts b/packages/main/src/interfaces/ListItemShape.ts similarity index 100% rename from packages/fiori3/src/interfaces/ListItemShape.ts rename to packages/main/src/interfaces/ListItemShape.ts diff --git a/packages/fiori3/src/interfaces/ObjectWithVariableKeys.ts b/packages/main/src/interfaces/ObjectWithVariableKeys.ts similarity index 100% rename from packages/fiori3/src/interfaces/ObjectWithVariableKeys.ts rename to packages/main/src/interfaces/ObjectWithVariableKeys.ts diff --git a/packages/fiori3/src/interfaces/ThemeOptions.ts b/packages/main/src/interfaces/ThemeOptions.ts similarity index 100% rename from packages/fiori3/src/interfaces/ThemeOptions.ts rename to packages/main/src/interfaces/ThemeOptions.ts diff --git a/packages/fiori3/src/interfaces/Ui5DomRef.ts b/packages/main/src/interfaces/Ui5DomRef.ts similarity index 100% rename from packages/fiori3/src/interfaces/Ui5DomRef.ts rename to packages/main/src/interfaces/Ui5DomRef.ts diff --git a/packages/fiori3/src/interfaces/Ui5Property.ts b/packages/main/src/interfaces/Ui5Property.ts similarity index 100% rename from packages/fiori3/src/interfaces/Ui5Property.ts rename to packages/main/src/interfaces/Ui5Property.ts diff --git a/packages/fiori3/src/interfaces/Ui5WebComponentMetadata.ts b/packages/main/src/interfaces/Ui5WebComponentMetadata.ts similarity index 100% rename from packages/fiori3/src/interfaces/Ui5WebComponentMetadata.ts rename to packages/main/src/interfaces/Ui5WebComponentMetadata.ts diff --git a/packages/fiori3/src/internal/WithWebComponent.karma.tsx b/packages/main/src/internal/WithWebComponent.karma.tsx similarity index 100% rename from packages/fiori3/src/internal/WithWebComponent.karma.tsx rename to packages/main/src/internal/WithWebComponent.karma.tsx diff --git a/packages/fiori3/src/internal/withWebComponent.tsx b/packages/main/src/internal/withWebComponent.tsx similarity index 99% rename from packages/fiori3/src/internal/withWebComponent.tsx rename to packages/main/src/internal/withWebComponent.tsx index 1226d29c311..1ef0cfcd9e7 100644 --- a/packages/fiori3/src/internal/withWebComponent.tsx +++ b/packages/main/src/internal/withWebComponent.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import React, { Children, cloneElement, Component, CSSProperties, FC, ReactElement } from 'react'; import { withTheme } from 'react-jss'; import { Fiori3CommonProps } from '../interfaces/Fiori3CommonProps'; diff --git a/packages/fiori3/src/lib/ActionSheet.ts b/packages/main/src/lib/ActionSheet.ts similarity index 100% rename from packages/fiori3/src/lib/ActionSheet.ts rename to packages/main/src/lib/ActionSheet.ts diff --git a/packages/fiori3/src/lib/AnalyticalCard.ts b/packages/main/src/lib/AnalyticalCard.ts similarity index 100% rename from packages/fiori3/src/lib/AnalyticalCard.ts rename to packages/main/src/lib/AnalyticalCard.ts diff --git a/packages/fiori3/src/lib/AnalyticalCardHeader.ts b/packages/main/src/lib/AnalyticalCardHeader.ts similarity index 100% rename from packages/fiori3/src/lib/AnalyticalCardHeader.ts rename to packages/main/src/lib/AnalyticalCardHeader.ts diff --git a/packages/fiori3/src/lib/AnalyticalTable.ts b/packages/main/src/lib/AnalyticalTable.ts similarity index 100% rename from packages/fiori3/src/lib/AnalyticalTable.ts rename to packages/main/src/lib/AnalyticalTable.ts diff --git a/packages/fiori3/src/lib/Avatar.ts b/packages/main/src/lib/Avatar.ts similarity index 100% rename from packages/fiori3/src/lib/Avatar.ts rename to packages/main/src/lib/Avatar.ts diff --git a/packages/fiori3/src/lib/AvatarShape.ts b/packages/main/src/lib/AvatarShape.ts similarity index 100% rename from packages/fiori3/src/lib/AvatarShape.ts rename to packages/main/src/lib/AvatarShape.ts diff --git a/packages/fiori3/src/lib/AvatarSize.ts b/packages/main/src/lib/AvatarSize.ts similarity index 100% rename from packages/fiori3/src/lib/AvatarSize.ts rename to packages/main/src/lib/AvatarSize.ts diff --git a/packages/fiori3/src/lib/Badge.ts b/packages/main/src/lib/Badge.ts similarity index 100% rename from packages/fiori3/src/lib/Badge.ts rename to packages/main/src/lib/Badge.ts diff --git a/packages/fiori3/src/lib/Bar.ts b/packages/main/src/lib/Bar.ts similarity index 100% rename from packages/fiori3/src/lib/Bar.ts rename to packages/main/src/lib/Bar.ts diff --git a/packages/fiori3/src/lib/BusyIndicator.ts b/packages/main/src/lib/BusyIndicator.ts similarity index 100% rename from packages/fiori3/src/lib/BusyIndicator.ts rename to packages/main/src/lib/BusyIndicator.ts diff --git a/packages/fiori3/src/lib/BusyIndicatorType.ts b/packages/main/src/lib/BusyIndicatorType.ts similarity index 100% rename from packages/fiori3/src/lib/BusyIndicatorType.ts rename to packages/main/src/lib/BusyIndicatorType.ts diff --git a/packages/fiori3/src/lib/Button.ts b/packages/main/src/lib/Button.ts similarity index 100% rename from packages/fiori3/src/lib/Button.ts rename to packages/main/src/lib/Button.ts diff --git a/packages/fiori3/src/lib/ButtonDesign.ts b/packages/main/src/lib/ButtonDesign.ts similarity index 100% rename from packages/fiori3/src/lib/ButtonDesign.ts rename to packages/main/src/lib/ButtonDesign.ts diff --git a/packages/fiori3/src/lib/Calendar.ts b/packages/main/src/lib/Calendar.ts similarity index 100% rename from packages/fiori3/src/lib/Calendar.ts rename to packages/main/src/lib/Calendar.ts diff --git a/packages/fiori3/src/lib/CalendarHeader.ts b/packages/main/src/lib/CalendarHeader.ts similarity index 100% rename from packages/fiori3/src/lib/CalendarHeader.ts rename to packages/main/src/lib/CalendarHeader.ts diff --git a/packages/fiori3/src/lib/CalendarType.ts b/packages/main/src/lib/CalendarType.ts similarity index 100% rename from packages/fiori3/src/lib/CalendarType.ts rename to packages/main/src/lib/CalendarType.ts diff --git a/packages/fiori3/src/lib/Card.ts b/packages/main/src/lib/Card.ts similarity index 100% rename from packages/fiori3/src/lib/Card.ts rename to packages/main/src/lib/Card.ts diff --git a/packages/fiori3/src/lib/Carousel.ts b/packages/main/src/lib/Carousel.ts similarity index 100% rename from packages/fiori3/src/lib/Carousel.ts rename to packages/main/src/lib/Carousel.ts diff --git a/packages/fiori3/src/lib/CarouselArrowsPlacement.ts b/packages/main/src/lib/CarouselArrowsPlacement.ts similarity index 100% rename from packages/fiori3/src/lib/CarouselArrowsPlacement.ts rename to packages/main/src/lib/CarouselArrowsPlacement.ts diff --git a/packages/fiori3/src/lib/CheckBox.ts b/packages/main/src/lib/CheckBox.ts similarity index 100% rename from packages/fiori3/src/lib/CheckBox.ts rename to packages/main/src/lib/CheckBox.ts diff --git a/packages/fiori3/src/lib/ContentDensity.ts b/packages/main/src/lib/ContentDensity.ts similarity index 100% rename from packages/fiori3/src/lib/ContentDensity.ts rename to packages/main/src/lib/ContentDensity.ts diff --git a/packages/fiori3/src/lib/CustomListItem.ts b/packages/main/src/lib/CustomListItem.ts similarity index 100% rename from packages/fiori3/src/lib/CustomListItem.ts rename to packages/main/src/lib/CustomListItem.ts diff --git a/packages/fiori3/src/lib/DatePicker.ts b/packages/main/src/lib/DatePicker.ts similarity index 100% rename from packages/fiori3/src/lib/DatePicker.ts rename to packages/main/src/lib/DatePicker.ts diff --git a/packages/fiori3/src/lib/DayPicker.ts b/packages/main/src/lib/DayPicker.ts similarity index 100% rename from packages/fiori3/src/lib/DayPicker.ts rename to packages/main/src/lib/DayPicker.ts diff --git a/packages/fiori3/src/lib/DeviationIndicator.ts b/packages/main/src/lib/DeviationIndicator.ts similarity index 100% rename from packages/fiori3/src/lib/DeviationIndicator.ts rename to packages/main/src/lib/DeviationIndicator.ts diff --git a/packages/fiori3/src/lib/Dialog.ts b/packages/main/src/lib/Dialog.ts similarity index 100% rename from packages/fiori3/src/lib/Dialog.ts rename to packages/main/src/lib/Dialog.ts diff --git a/packages/fiori3/src/lib/FilterBar.ts b/packages/main/src/lib/FilterBar.ts similarity index 100% rename from packages/fiori3/src/lib/FilterBar.ts rename to packages/main/src/lib/FilterBar.ts diff --git a/packages/fiori3/src/lib/FilterItem.ts b/packages/main/src/lib/FilterItem.ts similarity index 100% rename from packages/fiori3/src/lib/FilterItem.ts rename to packages/main/src/lib/FilterItem.ts diff --git a/packages/fiori3/src/lib/FilterType.ts b/packages/main/src/lib/FilterType.ts similarity index 100% rename from packages/fiori3/src/lib/FilterType.ts rename to packages/main/src/lib/FilterType.ts diff --git a/packages/fiori3/src/lib/FlexBox.ts b/packages/main/src/lib/FlexBox.ts similarity index 100% rename from packages/fiori3/src/lib/FlexBox.ts rename to packages/main/src/lib/FlexBox.ts diff --git a/packages/fiori3/src/lib/FlexBoxAlignItems.ts b/packages/main/src/lib/FlexBoxAlignItems.ts similarity index 100% rename from packages/fiori3/src/lib/FlexBoxAlignItems.ts rename to packages/main/src/lib/FlexBoxAlignItems.ts diff --git a/packages/fiori3/src/lib/FlexBoxDirection.ts b/packages/main/src/lib/FlexBoxDirection.ts similarity index 100% rename from packages/fiori3/src/lib/FlexBoxDirection.ts rename to packages/main/src/lib/FlexBoxDirection.ts diff --git a/packages/fiori3/src/lib/FlexBoxJustifyContent.ts b/packages/main/src/lib/FlexBoxJustifyContent.ts similarity index 100% rename from packages/fiori3/src/lib/FlexBoxJustifyContent.ts rename to packages/main/src/lib/FlexBoxJustifyContent.ts diff --git a/packages/fiori3/src/lib/FlexBoxWrap.ts b/packages/main/src/lib/FlexBoxWrap.ts similarity index 100% rename from packages/fiori3/src/lib/FlexBoxWrap.ts rename to packages/main/src/lib/FlexBoxWrap.ts diff --git a/packages/fiori3/src/lib/Grid.ts b/packages/main/src/lib/Grid.ts similarity index 100% rename from packages/fiori3/src/lib/Grid.ts rename to packages/main/src/lib/Grid.ts diff --git a/packages/fiori3/src/lib/GridPosition.ts b/packages/main/src/lib/GridPosition.ts similarity index 100% rename from packages/fiori3/src/lib/GridPosition.ts rename to packages/main/src/lib/GridPosition.ts diff --git a/packages/fiori3/src/lib/GroupHeaderListItem.ts b/packages/main/src/lib/GroupHeaderListItem.ts similarity index 100% rename from packages/fiori3/src/lib/GroupHeaderListItem.ts rename to packages/main/src/lib/GroupHeaderListItem.ts diff --git a/packages/fiori3/src/lib/Icon.ts b/packages/main/src/lib/Icon.ts similarity index 100% rename from packages/fiori3/src/lib/Icon.ts rename to packages/main/src/lib/Icon.ts diff --git a/packages/fiori3/src/lib/Input.ts b/packages/main/src/lib/Input.ts similarity index 100% rename from packages/fiori3/src/lib/Input.ts rename to packages/main/src/lib/Input.ts diff --git a/packages/fiori3/src/lib/InputType.ts b/packages/main/src/lib/InputType.ts similarity index 100% rename from packages/fiori3/src/lib/InputType.ts rename to packages/main/src/lib/InputType.ts diff --git a/packages/fiori3/src/lib/Label.ts b/packages/main/src/lib/Label.ts similarity index 100% rename from packages/fiori3/src/lib/Label.ts rename to packages/main/src/lib/Label.ts diff --git a/packages/fiori3/src/lib/Link.ts b/packages/main/src/lib/Link.ts similarity index 100% rename from packages/fiori3/src/lib/Link.ts rename to packages/main/src/lib/Link.ts diff --git a/packages/fiori3/src/lib/LinkDesign.ts b/packages/main/src/lib/LinkDesign.ts similarity index 100% rename from packages/fiori3/src/lib/LinkDesign.ts rename to packages/main/src/lib/LinkDesign.ts diff --git a/packages/fiori3/src/lib/List.ts b/packages/main/src/lib/List.ts similarity index 100% rename from packages/fiori3/src/lib/List.ts rename to packages/main/src/lib/List.ts diff --git a/packages/fiori3/src/lib/ListItem.ts b/packages/main/src/lib/ListItem.ts similarity index 100% rename from packages/fiori3/src/lib/ListItem.ts rename to packages/main/src/lib/ListItem.ts diff --git a/packages/fiori3/src/lib/ListItemBase.ts b/packages/main/src/lib/ListItemBase.ts similarity index 100% rename from packages/fiori3/src/lib/ListItemBase.ts rename to packages/main/src/lib/ListItemBase.ts diff --git a/packages/fiori3/src/lib/ListItemTypes.ts b/packages/main/src/lib/ListItemTypes.ts similarity index 100% rename from packages/fiori3/src/lib/ListItemTypes.ts rename to packages/main/src/lib/ListItemTypes.ts diff --git a/packages/fiori3/src/lib/ListMode.ts b/packages/main/src/lib/ListMode.ts similarity index 100% rename from packages/fiori3/src/lib/ListMode.ts rename to packages/main/src/lib/ListMode.ts diff --git a/packages/fiori3/src/lib/ListSeparators.ts b/packages/main/src/lib/ListSeparators.ts similarity index 100% rename from packages/fiori3/src/lib/ListSeparators.ts rename to packages/main/src/lib/ListSeparators.ts diff --git a/packages/fiori3/src/lib/MessageBox.ts b/packages/main/src/lib/MessageBox.ts similarity index 100% rename from packages/fiori3/src/lib/MessageBox.ts rename to packages/main/src/lib/MessageBox.ts diff --git a/packages/fiori3/src/lib/MessageBoxActions.ts b/packages/main/src/lib/MessageBoxActions.ts similarity index 100% rename from packages/fiori3/src/lib/MessageBoxActions.ts rename to packages/main/src/lib/MessageBoxActions.ts diff --git a/packages/fiori3/src/lib/MessageBoxButton.ts b/packages/main/src/lib/MessageBoxButton.ts similarity index 100% rename from packages/fiori3/src/lib/MessageBoxButton.ts rename to packages/main/src/lib/MessageBoxButton.ts diff --git a/packages/fiori3/src/lib/MessageBoxTypes.ts b/packages/main/src/lib/MessageBoxTypes.ts similarity index 100% rename from packages/fiori3/src/lib/MessageBoxTypes.ts rename to packages/main/src/lib/MessageBoxTypes.ts diff --git a/packages/fiori3/src/lib/MessageStrip.ts b/packages/main/src/lib/MessageStrip.ts similarity index 100% rename from packages/fiori3/src/lib/MessageStrip.ts rename to packages/main/src/lib/MessageStrip.ts diff --git a/packages/fiori3/src/lib/MessageStripType.ts b/packages/main/src/lib/MessageStripType.ts similarity index 100% rename from packages/fiori3/src/lib/MessageStripType.ts rename to packages/main/src/lib/MessageStripType.ts diff --git a/packages/fiori3/src/lib/MessageToast.ts b/packages/main/src/lib/MessageToast.ts similarity index 100% rename from packages/fiori3/src/lib/MessageToast.ts rename to packages/main/src/lib/MessageToast.ts diff --git a/packages/fiori3/src/lib/MonthPicker.ts b/packages/main/src/lib/MonthPicker.ts similarity index 100% rename from packages/fiori3/src/lib/MonthPicker.ts rename to packages/main/src/lib/MonthPicker.ts diff --git a/packages/fiori3/src/lib/MultiComboBox.ts b/packages/main/src/lib/MultiComboBox.ts similarity index 100% rename from packages/fiori3/src/lib/MultiComboBox.ts rename to packages/main/src/lib/MultiComboBox.ts diff --git a/packages/fiori3/src/lib/ObjectPage.ts b/packages/main/src/lib/ObjectPage.ts similarity index 100% rename from packages/fiori3/src/lib/ObjectPage.ts rename to packages/main/src/lib/ObjectPage.ts diff --git a/packages/fiori3/src/lib/ObjectPageMode.ts b/packages/main/src/lib/ObjectPageMode.ts similarity index 100% rename from packages/fiori3/src/lib/ObjectPageMode.ts rename to packages/main/src/lib/ObjectPageMode.ts diff --git a/packages/fiori3/src/lib/ObjectPageSection.ts b/packages/main/src/lib/ObjectPageSection.ts similarity index 100% rename from packages/fiori3/src/lib/ObjectPageSection.ts rename to packages/main/src/lib/ObjectPageSection.ts diff --git a/packages/fiori3/src/lib/ObjectPageSubSection.ts b/packages/main/src/lib/ObjectPageSubSection.ts similarity index 100% rename from packages/fiori3/src/lib/ObjectPageSubSection.ts rename to packages/main/src/lib/ObjectPageSubSection.ts diff --git a/packages/fiori3/src/lib/ObjectStatus.ts b/packages/main/src/lib/ObjectStatus.ts similarity index 100% rename from packages/fiori3/src/lib/ObjectStatus.ts rename to packages/main/src/lib/ObjectStatus.ts diff --git a/packages/fiori3/src/lib/Option.ts b/packages/main/src/lib/Option.ts similarity index 100% rename from packages/fiori3/src/lib/Option.ts rename to packages/main/src/lib/Option.ts diff --git a/packages/fiori3/src/lib/Page.ts b/packages/main/src/lib/Page.ts similarity index 100% rename from packages/fiori3/src/lib/Page.ts rename to packages/main/src/lib/Page.ts diff --git a/packages/fiori3/src/lib/PageBackgroundDesign.ts b/packages/main/src/lib/PageBackgroundDesign.ts similarity index 100% rename from packages/fiori3/src/lib/PageBackgroundDesign.ts rename to packages/main/src/lib/PageBackgroundDesign.ts diff --git a/packages/fiori3/src/lib/Panel.ts b/packages/main/src/lib/Panel.ts similarity index 100% rename from packages/fiori3/src/lib/Panel.ts rename to packages/main/src/lib/Panel.ts diff --git a/packages/fiori3/src/lib/PanelAccessibleRoles.ts b/packages/main/src/lib/PanelAccessibleRoles.ts similarity index 100% rename from packages/fiori3/src/lib/PanelAccessibleRoles.ts rename to packages/main/src/lib/PanelAccessibleRoles.ts diff --git a/packages/fiori3/src/lib/PlacementType.ts b/packages/main/src/lib/PlacementType.ts similarity index 100% rename from packages/fiori3/src/lib/PlacementType.ts rename to packages/main/src/lib/PlacementType.ts diff --git a/packages/fiori3/src/lib/Popover.ts b/packages/main/src/lib/Popover.ts similarity index 100% rename from packages/fiori3/src/lib/Popover.ts rename to packages/main/src/lib/Popover.ts diff --git a/packages/fiori3/src/lib/PopoverHorizontalAlign.ts b/packages/main/src/lib/PopoverHorizontalAlign.ts similarity index 100% rename from packages/fiori3/src/lib/PopoverHorizontalAlign.ts rename to packages/main/src/lib/PopoverHorizontalAlign.ts diff --git a/packages/fiori3/src/lib/PopoverVerticalAlign.ts b/packages/main/src/lib/PopoverVerticalAlign.ts similarity index 100% rename from packages/fiori3/src/lib/PopoverVerticalAlign.ts rename to packages/main/src/lib/PopoverVerticalAlign.ts diff --git a/packages/fiori3/src/lib/Popup.ts b/packages/main/src/lib/Popup.ts similarity index 100% rename from packages/fiori3/src/lib/Popup.ts rename to packages/main/src/lib/Popup.ts diff --git a/packages/fiori3/src/lib/ProgressIndicator.ts b/packages/main/src/lib/ProgressIndicator.ts similarity index 100% rename from packages/fiori3/src/lib/ProgressIndicator.ts rename to packages/main/src/lib/ProgressIndicator.ts diff --git a/packages/fiori3/src/lib/RadioButton.ts b/packages/main/src/lib/RadioButton.ts similarity index 100% rename from packages/fiori3/src/lib/RadioButton.ts rename to packages/main/src/lib/RadioButton.ts diff --git a/packages/fiori3/src/lib/SegmentedButton.ts b/packages/main/src/lib/SegmentedButton.ts similarity index 100% rename from packages/fiori3/src/lib/SegmentedButton.ts rename to packages/main/src/lib/SegmentedButton.ts diff --git a/packages/fiori3/src/lib/SegmentedButtonItem.ts b/packages/main/src/lib/SegmentedButtonItem.ts similarity index 100% rename from packages/fiori3/src/lib/SegmentedButtonItem.ts rename to packages/main/src/lib/SegmentedButtonItem.ts diff --git a/packages/fiori3/src/lib/Select.ts b/packages/main/src/lib/Select.ts similarity index 100% rename from packages/fiori3/src/lib/Select.ts rename to packages/main/src/lib/Select.ts diff --git a/packages/fiori3/src/lib/SemanticColor.ts b/packages/main/src/lib/SemanticColor.ts similarity index 100% rename from packages/fiori3/src/lib/SemanticColor.ts rename to packages/main/src/lib/SemanticColor.ts diff --git a/packages/fiori3/src/lib/ShellBar.ts b/packages/main/src/lib/ShellBar.ts similarity index 100% rename from packages/fiori3/src/lib/ShellBar.ts rename to packages/main/src/lib/ShellBar.ts diff --git a/packages/fiori3/src/lib/ShellBarItem.ts b/packages/main/src/lib/ShellBarItem.ts similarity index 100% rename from packages/fiori3/src/lib/ShellBarItem.ts rename to packages/main/src/lib/ShellBarItem.ts diff --git a/packages/fiori3/src/lib/Size.ts b/packages/main/src/lib/Size.ts similarity index 100% rename from packages/fiori3/src/lib/Size.ts rename to packages/main/src/lib/Size.ts diff --git a/packages/fiori3/src/lib/Spinner.ts b/packages/main/src/lib/Spinner.ts similarity index 100% rename from packages/fiori3/src/lib/Spinner.ts rename to packages/main/src/lib/Spinner.ts diff --git a/packages/fiori3/src/lib/StandardListItem.ts b/packages/main/src/lib/StandardListItem.ts similarity index 100% rename from packages/fiori3/src/lib/StandardListItem.ts rename to packages/main/src/lib/StandardListItem.ts diff --git a/packages/fiori3/src/lib/Switch.ts b/packages/main/src/lib/Switch.ts similarity index 100% rename from packages/fiori3/src/lib/Switch.ts rename to packages/main/src/lib/Switch.ts diff --git a/packages/fiori3/src/lib/Tab.ts b/packages/main/src/lib/Tab.ts similarity index 100% rename from packages/fiori3/src/lib/Tab.ts rename to packages/main/src/lib/Tab.ts diff --git a/packages/fiori3/src/lib/TabBase.ts b/packages/main/src/lib/TabBase.ts similarity index 100% rename from packages/fiori3/src/lib/TabBase.ts rename to packages/main/src/lib/TabBase.ts diff --git a/packages/fiori3/src/lib/TabContainer.ts b/packages/main/src/lib/TabContainer.ts similarity index 100% rename from packages/fiori3/src/lib/TabContainer.ts rename to packages/main/src/lib/TabContainer.ts diff --git a/packages/fiori3/src/lib/TabSeparator.ts b/packages/main/src/lib/TabSeparator.ts similarity index 100% rename from packages/fiori3/src/lib/TabSeparator.ts rename to packages/main/src/lib/TabSeparator.ts diff --git a/packages/fiori3/src/lib/Table.ts b/packages/main/src/lib/Table.ts similarity index 100% rename from packages/fiori3/src/lib/Table.ts rename to packages/main/src/lib/Table.ts diff --git a/packages/fiori3/src/lib/TableCell.ts b/packages/main/src/lib/TableCell.ts similarity index 100% rename from packages/fiori3/src/lib/TableCell.ts rename to packages/main/src/lib/TableCell.ts diff --git a/packages/fiori3/src/lib/TableColumn.ts b/packages/main/src/lib/TableColumn.ts similarity index 100% rename from packages/fiori3/src/lib/TableColumn.ts rename to packages/main/src/lib/TableColumn.ts diff --git a/packages/fiori3/src/lib/TableRow.ts b/packages/main/src/lib/TableRow.ts similarity index 100% rename from packages/fiori3/src/lib/TableRow.ts rename to packages/main/src/lib/TableRow.ts diff --git a/packages/fiori3/src/lib/Text.ts b/packages/main/src/lib/Text.ts similarity index 100% rename from packages/fiori3/src/lib/Text.ts rename to packages/main/src/lib/Text.ts diff --git a/packages/fiori3/src/lib/TextAlign.ts b/packages/main/src/lib/TextAlign.ts similarity index 100% rename from packages/fiori3/src/lib/TextAlign.ts rename to packages/main/src/lib/TextAlign.ts diff --git a/packages/fiori3/src/lib/TextArea.ts b/packages/main/src/lib/TextArea.ts similarity index 100% rename from packages/fiori3/src/lib/TextArea.ts rename to packages/main/src/lib/TextArea.ts diff --git a/packages/fiori3/src/lib/ThemeProvider.ts b/packages/main/src/lib/ThemeProvider.ts similarity index 100% rename from packages/fiori3/src/lib/ThemeProvider.ts rename to packages/main/src/lib/ThemeProvider.ts diff --git a/packages/fiori3/src/lib/Themes.ts b/packages/main/src/lib/Themes.ts similarity index 100% rename from packages/fiori3/src/lib/Themes.ts rename to packages/main/src/lib/Themes.ts diff --git a/packages/fiori3/src/lib/Timeline.ts b/packages/main/src/lib/Timeline.ts similarity index 100% rename from packages/fiori3/src/lib/Timeline.ts rename to packages/main/src/lib/Timeline.ts diff --git a/packages/fiori3/src/lib/TimelineItem.ts b/packages/main/src/lib/TimelineItem.ts similarity index 100% rename from packages/fiori3/src/lib/TimelineItem.ts rename to packages/main/src/lib/TimelineItem.ts diff --git a/packages/fiori3/src/lib/Title.ts b/packages/main/src/lib/Title.ts similarity index 100% rename from packages/fiori3/src/lib/Title.ts rename to packages/main/src/lib/Title.ts diff --git a/packages/fiori3/src/lib/TitleLevel.ts b/packages/main/src/lib/TitleLevel.ts similarity index 100% rename from packages/fiori3/src/lib/TitleLevel.ts rename to packages/main/src/lib/TitleLevel.ts diff --git a/packages/fiori3/src/lib/ToggleButton.ts b/packages/main/src/lib/ToggleButton.ts similarity index 100% rename from packages/fiori3/src/lib/ToggleButton.ts rename to packages/main/src/lib/ToggleButton.ts diff --git a/packages/fiori3/src/lib/Token.ts b/packages/main/src/lib/Token.ts similarity index 100% rename from packages/fiori3/src/lib/Token.ts rename to packages/main/src/lib/Token.ts diff --git a/packages/fiori3/src/lib/Tokenizer.ts b/packages/main/src/lib/Tokenizer.ts similarity index 100% rename from packages/fiori3/src/lib/Tokenizer.ts rename to packages/main/src/lib/Tokenizer.ts diff --git a/packages/fiori3/src/lib/ValueState.ts b/packages/main/src/lib/ValueState.ts similarity index 100% rename from packages/fiori3/src/lib/ValueState.ts rename to packages/main/src/lib/ValueState.ts diff --git a/packages/fiori3/src/lib/VariantManagement.ts b/packages/main/src/lib/VariantManagement.ts similarity index 100% rename from packages/fiori3/src/lib/VariantManagement.ts rename to packages/main/src/lib/VariantManagement.ts diff --git a/packages/fiori3/src/lib/VerticalAlign.ts b/packages/main/src/lib/VerticalAlign.ts similarity index 100% rename from packages/fiori3/src/lib/VerticalAlign.ts rename to packages/main/src/lib/VerticalAlign.ts diff --git a/packages/fiori3/src/lib/YearPicker.ts b/packages/main/src/lib/YearPicker.ts similarity index 100% rename from packages/fiori3/src/lib/YearPicker.ts rename to packages/main/src/lib/YearPicker.ts diff --git a/packages/fiori3/src/webComponents/Badge/Badge.karma.tsx b/packages/main/src/webComponents/Badge/Badge.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Badge/Badge.karma.tsx rename to packages/main/src/webComponents/Badge/Badge.karma.tsx diff --git a/packages/fiori3/src/webComponents/Badge/demo.stories.tsx b/packages/main/src/webComponents/Badge/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Badge/demo.stories.tsx rename to packages/main/src/webComponents/Badge/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Badge/index.tsx b/packages/main/src/webComponents/Badge/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Badge/index.tsx rename to packages/main/src/webComponents/Badge/index.tsx diff --git a/packages/fiori3/src/webComponents/BusyIndicator/BusyIndicator.karma.tsx b/packages/main/src/webComponents/BusyIndicator/BusyIndicator.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/BusyIndicator/BusyIndicator.karma.tsx rename to packages/main/src/webComponents/BusyIndicator/BusyIndicator.karma.tsx diff --git a/packages/fiori3/src/webComponents/BusyIndicator/demo.stories.tsx b/packages/main/src/webComponents/BusyIndicator/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/BusyIndicator/demo.stories.tsx rename to packages/main/src/webComponents/BusyIndicator/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/BusyIndicator/index.tsx b/packages/main/src/webComponents/BusyIndicator/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/BusyIndicator/index.tsx rename to packages/main/src/webComponents/BusyIndicator/index.tsx diff --git a/packages/fiori3/src/webComponents/Button/Button.karma.tsx b/packages/main/src/webComponents/Button/Button.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Button/Button.karma.tsx rename to packages/main/src/webComponents/Button/Button.karma.tsx diff --git a/packages/fiori3/src/webComponents/Button/demo.stories.tsx b/packages/main/src/webComponents/Button/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Button/demo.stories.tsx rename to packages/main/src/webComponents/Button/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Button/index.tsx b/packages/main/src/webComponents/Button/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/Button/index.tsx rename to packages/main/src/webComponents/Button/index.tsx index 130c2726487..17baf1923d0 100644 --- a/packages/fiori3/src/webComponents/Button/index.tsx +++ b/packages/main/src/webComponents/Button/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { ButtonDesign } from '../../lib/ButtonDesign'; -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Button from '@ui5/webcomponents/dist/Button'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Calendar/Calendar.karma.tsx b/packages/main/src/webComponents/Calendar/Calendar.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Calendar/Calendar.karma.tsx rename to packages/main/src/webComponents/Calendar/Calendar.karma.tsx diff --git a/packages/fiori3/src/webComponents/Calendar/demo.stories.tsx b/packages/main/src/webComponents/Calendar/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Calendar/demo.stories.tsx rename to packages/main/src/webComponents/Calendar/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Calendar/index.tsx b/packages/main/src/webComponents/Calendar/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/Calendar/index.tsx rename to packages/main/src/webComponents/Calendar/index.tsx index 8b4e3d23b9e..855959f416d 100644 --- a/packages/fiori3/src/webComponents/Calendar/index.tsx +++ b/packages/main/src/webComponents/Calendar/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Calendar from '@ui5/webcomponents/dist/Calendar'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/CalendarHeader/CalendarHeader.karma.tsx b/packages/main/src/webComponents/CalendarHeader/CalendarHeader.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/CalendarHeader/CalendarHeader.karma.tsx rename to packages/main/src/webComponents/CalendarHeader/CalendarHeader.karma.tsx diff --git a/packages/fiori3/src/webComponents/CalendarHeader/index.tsx b/packages/main/src/webComponents/CalendarHeader/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/CalendarHeader/index.tsx rename to packages/main/src/webComponents/CalendarHeader/index.tsx index 06406f295e5..35e87b9f26b 100644 --- a/packages/fiori3/src/webComponents/CalendarHeader/index.tsx +++ b/packages/main/src/webComponents/CalendarHeader/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5CalendarHeader from '@ui5/webcomponents/dist/CalendarHeader'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Card/Card.karma.tsx b/packages/main/src/webComponents/Card/Card.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Card/Card.karma.tsx rename to packages/main/src/webComponents/Card/Card.karma.tsx diff --git a/packages/fiori3/src/webComponents/Card/demo.stories.tsx b/packages/main/src/webComponents/Card/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Card/demo.stories.tsx rename to packages/main/src/webComponents/Card/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Card/index.tsx b/packages/main/src/webComponents/Card/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Card/index.tsx rename to packages/main/src/webComponents/Card/index.tsx diff --git a/packages/fiori3/src/webComponents/CheckBox/CheckBox.karma.tsx b/packages/main/src/webComponents/CheckBox/CheckBox.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/CheckBox/CheckBox.karma.tsx rename to packages/main/src/webComponents/CheckBox/CheckBox.karma.tsx diff --git a/packages/fiori3/src/webComponents/CheckBox/demo.stories.tsx b/packages/main/src/webComponents/CheckBox/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/CheckBox/demo.stories.tsx rename to packages/main/src/webComponents/CheckBox/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/CheckBox/index.tsx b/packages/main/src/webComponents/CheckBox/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/CheckBox/index.tsx rename to packages/main/src/webComponents/CheckBox/index.tsx index 02b067a022e..47757b13ae8 100644 --- a/packages/fiori3/src/webComponents/CheckBox/index.tsx +++ b/packages/main/src/webComponents/CheckBox/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5CheckBox from '@ui5/webcomponents/dist/CheckBox'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/CustomListItem/CustomListItem.karma.tsx b/packages/main/src/webComponents/CustomListItem/CustomListItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/CustomListItem/CustomListItem.karma.tsx rename to packages/main/src/webComponents/CustomListItem/CustomListItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/CustomListItem/index.tsx b/packages/main/src/webComponents/CustomListItem/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/CustomListItem/index.tsx rename to packages/main/src/webComponents/CustomListItem/index.tsx diff --git a/packages/fiori3/src/webComponents/DatePicker/DatePicker.karma.tsx b/packages/main/src/webComponents/DatePicker/DatePicker.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/DatePicker/DatePicker.karma.tsx rename to packages/main/src/webComponents/DatePicker/DatePicker.karma.tsx diff --git a/packages/fiori3/src/webComponents/DatePicker/demo.stories.tsx b/packages/main/src/webComponents/DatePicker/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/DatePicker/demo.stories.tsx rename to packages/main/src/webComponents/DatePicker/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/DatePicker/index.tsx b/packages/main/src/webComponents/DatePicker/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/DatePicker/index.tsx rename to packages/main/src/webComponents/DatePicker/index.tsx index 684c457e0c4..2ecf00fc59e 100644 --- a/packages/fiori3/src/webComponents/DatePicker/index.tsx +++ b/packages/main/src/webComponents/DatePicker/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5DatePicker from '@ui5/webcomponents/dist/DatePicker'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/DayPicker/DayPicker.karma.tsx b/packages/main/src/webComponents/DayPicker/DayPicker.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/DayPicker/DayPicker.karma.tsx rename to packages/main/src/webComponents/DayPicker/DayPicker.karma.tsx diff --git a/packages/fiori3/src/webComponents/DayPicker/index.tsx b/packages/main/src/webComponents/DayPicker/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/DayPicker/index.tsx rename to packages/main/src/webComponents/DayPicker/index.tsx index 9d6c5b83d5f..199893d1593 100644 --- a/packages/fiori3/src/webComponents/DayPicker/index.tsx +++ b/packages/main/src/webComponents/DayPicker/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5DayPicker from '@ui5/webcomponents/dist/DayPicker'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Dialog/Dialog.karma.tsx b/packages/main/src/webComponents/Dialog/Dialog.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Dialog/Dialog.karma.tsx rename to packages/main/src/webComponents/Dialog/Dialog.karma.tsx diff --git a/packages/fiori3/src/webComponents/Dialog/demo.stories.tsx b/packages/main/src/webComponents/Dialog/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Dialog/demo.stories.tsx rename to packages/main/src/webComponents/Dialog/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Dialog/index.tsx b/packages/main/src/webComponents/Dialog/index.tsx similarity index 96% rename from packages/fiori3/src/webComponents/Dialog/index.tsx rename to packages/main/src/webComponents/Dialog/index.tsx index 1bff605e94d..167eaf44edd 100644 --- a/packages/fiori3/src/webComponents/Dialog/index.tsx +++ b/packages/main/src/webComponents/Dialog/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Dialog from '@ui5/webcomponents/dist/Dialog'; import React, { Component, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/GroupHeaderListItem/GroupHeaderListItem.karma.tsx b/packages/main/src/webComponents/GroupHeaderListItem/GroupHeaderListItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/GroupHeaderListItem/GroupHeaderListItem.karma.tsx rename to packages/main/src/webComponents/GroupHeaderListItem/GroupHeaderListItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/GroupHeaderListItem/index.tsx b/packages/main/src/webComponents/GroupHeaderListItem/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/GroupHeaderListItem/index.tsx rename to packages/main/src/webComponents/GroupHeaderListItem/index.tsx diff --git a/packages/fiori3/src/webComponents/Icon/Icon.karma.tsx b/packages/main/src/webComponents/Icon/Icon.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Icon/Icon.karma.tsx rename to packages/main/src/webComponents/Icon/Icon.karma.tsx diff --git a/packages/main/src/webComponents/Icon/demo.stories.tsx b/packages/main/src/webComponents/Icon/demo.stories.tsx new file mode 100644 index 00000000000..6260c15e380 --- /dev/null +++ b/packages/main/src/webComponents/Icon/demo.stories.tsx @@ -0,0 +1,9 @@ +import { storiesOf } from '@storybook/react'; +import React from 'react'; +import { text } from '@storybook/addon-knobs'; +import { action } from '@storybook/addon-actions'; +import { Icon } from '../../lib/Icon'; + +storiesOf('UI5 Web Components | Icon', module).add('Default story', () => ( + +)); diff --git a/packages/fiori3/src/webComponents/Icon/index.tsx b/packages/main/src/webComponents/Icon/index.tsx similarity index 90% rename from packages/fiori3/src/webComponents/Icon/index.tsx rename to packages/main/src/webComponents/Icon/index.tsx index dc2bdb7fc0d..3b715d9055d 100644 --- a/packages/fiori3/src/webComponents/Icon/index.tsx +++ b/packages/main/src/webComponents/Icon/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Icon from '@ui5/webcomponents/dist/Icon'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Input/Input.karma.tsx b/packages/main/src/webComponents/Input/Input.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Input/Input.karma.tsx rename to packages/main/src/webComponents/Input/Input.karma.tsx diff --git a/packages/fiori3/src/webComponents/Input/demo.stories.tsx b/packages/main/src/webComponents/Input/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Input/demo.stories.tsx rename to packages/main/src/webComponents/Input/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Input/index.tsx b/packages/main/src/webComponents/Input/index.tsx similarity index 95% rename from packages/fiori3/src/webComponents/Input/index.tsx rename to packages/main/src/webComponents/Input/index.tsx index fd5a48f9894..bf4c680cc91 100644 --- a/packages/fiori3/src/webComponents/Input/index.tsx +++ b/packages/main/src/webComponents/Input/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Input from '@ui5/webcomponents/dist/Input'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Label/Label.karma.tsx b/packages/main/src/webComponents/Label/Label.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Label/Label.karma.tsx rename to packages/main/src/webComponents/Label/Label.karma.tsx diff --git a/packages/fiori3/src/webComponents/Label/demo.stories.tsx b/packages/main/src/webComponents/Label/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Label/demo.stories.tsx rename to packages/main/src/webComponents/Label/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Label/index.tsx b/packages/main/src/webComponents/Label/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Label/index.tsx rename to packages/main/src/webComponents/Label/index.tsx diff --git a/packages/fiori3/src/webComponents/Link/Link.karma.tsx b/packages/main/src/webComponents/Link/Link.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Link/Link.karma.tsx rename to packages/main/src/webComponents/Link/Link.karma.tsx diff --git a/packages/fiori3/src/webComponents/Link/demo.stories.tsx b/packages/main/src/webComponents/Link/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Link/demo.stories.tsx rename to packages/main/src/webComponents/Link/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Link/index.tsx b/packages/main/src/webComponents/Link/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/Link/index.tsx rename to packages/main/src/webComponents/Link/index.tsx index 2b4b9e7b9c2..8430b999b0e 100644 --- a/packages/fiori3/src/webComponents/Link/index.tsx +++ b/packages/main/src/webComponents/Link/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Link from '@ui5/webcomponents/dist/Link'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/List/List.karma.tsx b/packages/main/src/webComponents/List/List.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/List/List.karma.tsx rename to packages/main/src/webComponents/List/List.karma.tsx diff --git a/packages/fiori3/src/webComponents/List/demo.stories.tsx b/packages/main/src/webComponents/List/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/List/demo.stories.tsx rename to packages/main/src/webComponents/List/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/List/index.tsx b/packages/main/src/webComponents/List/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/List/index.tsx rename to packages/main/src/webComponents/List/index.tsx index fb0c4eaa2c5..5e73be5a31d 100644 --- a/packages/fiori3/src/webComponents/List/index.tsx +++ b/packages/main/src/webComponents/List/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5List from '@ui5/webcomponents/dist/List'; import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/ListItem/ListItem.karma.tsx b/packages/main/src/webComponents/ListItem/ListItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ListItem/ListItem.karma.tsx rename to packages/main/src/webComponents/ListItem/ListItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/ListItem/index.tsx b/packages/main/src/webComponents/ListItem/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ListItem/index.tsx rename to packages/main/src/webComponents/ListItem/index.tsx diff --git a/packages/fiori3/src/webComponents/ListItemBase/ListItemBase.karma.tsx b/packages/main/src/webComponents/ListItemBase/ListItemBase.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ListItemBase/ListItemBase.karma.tsx rename to packages/main/src/webComponents/ListItemBase/ListItemBase.karma.tsx diff --git a/packages/fiori3/src/webComponents/ListItemBase/index.tsx b/packages/main/src/webComponents/ListItemBase/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ListItemBase/index.tsx rename to packages/main/src/webComponents/ListItemBase/index.tsx diff --git a/packages/fiori3/src/webComponents/MessageStrip/MessageStrip.karma.tsx b/packages/main/src/webComponents/MessageStrip/MessageStrip.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/MessageStrip/MessageStrip.karma.tsx rename to packages/main/src/webComponents/MessageStrip/MessageStrip.karma.tsx diff --git a/packages/fiori3/src/webComponents/MessageStrip/demo.stories.tsx b/packages/main/src/webComponents/MessageStrip/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/MessageStrip/demo.stories.tsx rename to packages/main/src/webComponents/MessageStrip/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/MessageStrip/index.tsx b/packages/main/src/webComponents/MessageStrip/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/MessageStrip/index.tsx rename to packages/main/src/webComponents/MessageStrip/index.tsx index 16dcdf0c2ae..32ea1a8294d 100644 --- a/packages/fiori3/src/webComponents/MessageStrip/index.tsx +++ b/packages/main/src/webComponents/MessageStrip/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5MessageStrip from '@ui5/webcomponents/dist/MessageStrip'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/MonthPicker/MonthPicker.karma.tsx b/packages/main/src/webComponents/MonthPicker/MonthPicker.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/MonthPicker/MonthPicker.karma.tsx rename to packages/main/src/webComponents/MonthPicker/MonthPicker.karma.tsx diff --git a/packages/fiori3/src/webComponents/MonthPicker/index.tsx b/packages/main/src/webComponents/MonthPicker/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/MonthPicker/index.tsx rename to packages/main/src/webComponents/MonthPicker/index.tsx index efe58a4ee27..b243cafbb55 100644 --- a/packages/fiori3/src/webComponents/MonthPicker/index.tsx +++ b/packages/main/src/webComponents/MonthPicker/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5MonthPicker from '@ui5/webcomponents/dist/MonthPicker'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/MultiComboBox/MultiComboBox.karma.tsx b/packages/main/src/webComponents/MultiComboBox/MultiComboBox.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/MultiComboBox/MultiComboBox.karma.tsx rename to packages/main/src/webComponents/MultiComboBox/MultiComboBox.karma.tsx diff --git a/packages/fiori3/src/webComponents/MultiComboBox/demo.stories.tsx b/packages/main/src/webComponents/MultiComboBox/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/MultiComboBox/demo.stories.tsx rename to packages/main/src/webComponents/MultiComboBox/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/MultiComboBox/index.tsx b/packages/main/src/webComponents/MultiComboBox/index.tsx similarity index 95% rename from packages/fiori3/src/webComponents/MultiComboBox/index.tsx rename to packages/main/src/webComponents/MultiComboBox/index.tsx index be659859f93..f614ebd0dc5 100644 --- a/packages/fiori3/src/webComponents/MultiComboBox/index.tsx +++ b/packages/main/src/webComponents/MultiComboBox/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import '@ui5/webcomponents/dist/InputSuggestions'; import UI5MultiComboBox from '@ui5/webcomponents/dist/MultiComboBox'; import React, { FC, ReactNode } from 'react'; diff --git a/packages/fiori3/src/webComponents/Option/Option.karma.tsx b/packages/main/src/webComponents/Option/Option.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Option/Option.karma.tsx rename to packages/main/src/webComponents/Option/Option.karma.tsx diff --git a/packages/fiori3/src/webComponents/Option/index.tsx b/packages/main/src/webComponents/Option/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Option/index.tsx rename to packages/main/src/webComponents/Option/index.tsx diff --git a/packages/fiori3/src/webComponents/Panel/Panel.karma.tsx b/packages/main/src/webComponents/Panel/Panel.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Panel/Panel.karma.tsx rename to packages/main/src/webComponents/Panel/Panel.karma.tsx diff --git a/packages/fiori3/src/webComponents/Panel/demo.stories.tsx b/packages/main/src/webComponents/Panel/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Panel/demo.stories.tsx rename to packages/main/src/webComponents/Panel/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Panel/index.tsx b/packages/main/src/webComponents/Panel/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/Panel/index.tsx rename to packages/main/src/webComponents/Panel/index.tsx index e0463534d0e..3e0d8c724c1 100644 --- a/packages/fiori3/src/webComponents/Panel/index.tsx +++ b/packages/main/src/webComponents/Panel/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Panel from '@ui5/webcomponents/dist/Panel'; import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Popover/Popover.karma.tsx b/packages/main/src/webComponents/Popover/Popover.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Popover/Popover.karma.tsx rename to packages/main/src/webComponents/Popover/Popover.karma.tsx diff --git a/packages/fiori3/src/webComponents/Popover/demo.stories.tsx b/packages/main/src/webComponents/Popover/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Popover/demo.stories.tsx rename to packages/main/src/webComponents/Popover/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Popover/index.tsx b/packages/main/src/webComponents/Popover/index.tsx similarity index 98% rename from packages/fiori3/src/webComponents/Popover/index.tsx rename to packages/main/src/webComponents/Popover/index.tsx index e894094770d..db3b2e31791 100644 --- a/packages/fiori3/src/webComponents/Popover/index.tsx +++ b/packages/main/src/webComponents/Popover/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Popover from '@ui5/webcomponents/dist/Popover'; import React, { Component, CSSProperties, ReactNode, RefObject } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Popup/Popup.karma.tsx b/packages/main/src/webComponents/Popup/Popup.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Popup/Popup.karma.tsx rename to packages/main/src/webComponents/Popup/Popup.karma.tsx diff --git a/packages/fiori3/src/webComponents/Popup/index.tsx b/packages/main/src/webComponents/Popup/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/Popup/index.tsx rename to packages/main/src/webComponents/Popup/index.tsx index c445c1c0dae..e22fc39c255 100644 --- a/packages/fiori3/src/webComponents/Popup/index.tsx +++ b/packages/main/src/webComponents/Popup/index.tsx @@ -1,5 +1,5 @@ import React, { FC, ReactNode } from 'react'; -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Popup from '@ui5/webcomponents/dist/Popup'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/RadioButton/RadioButton.karma.tsx b/packages/main/src/webComponents/RadioButton/RadioButton.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/RadioButton/RadioButton.karma.tsx rename to packages/main/src/webComponents/RadioButton/RadioButton.karma.tsx diff --git a/packages/fiori3/src/webComponents/RadioButton/demo.stories.tsx b/packages/main/src/webComponents/RadioButton/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/RadioButton/demo.stories.tsx rename to packages/main/src/webComponents/RadioButton/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/RadioButton/index.tsx b/packages/main/src/webComponents/RadioButton/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/RadioButton/index.tsx rename to packages/main/src/webComponents/RadioButton/index.tsx index a88e3ead781..dc4d1ae6183 100644 --- a/packages/fiori3/src/webComponents/RadioButton/index.tsx +++ b/packages/main/src/webComponents/RadioButton/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5RadioButton from '@ui5/webcomponents/dist/RadioButton'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Select/Select.karma.tsx b/packages/main/src/webComponents/Select/Select.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Select/Select.karma.tsx rename to packages/main/src/webComponents/Select/Select.karma.tsx diff --git a/packages/fiori3/src/webComponents/Select/demo.stories.tsx b/packages/main/src/webComponents/Select/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Select/demo.stories.tsx rename to packages/main/src/webComponents/Select/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Select/index.tsx b/packages/main/src/webComponents/Select/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/Select/index.tsx rename to packages/main/src/webComponents/Select/index.tsx index 3bcc7e29e10..bda65107f1c 100644 --- a/packages/fiori3/src/webComponents/Select/index.tsx +++ b/packages/main/src/webComponents/Select/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Select from '@ui5/webcomponents/dist/Select'; import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/ShellBar/ShellBar.karma.tsx b/packages/main/src/webComponents/ShellBar/ShellBar.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ShellBar/ShellBar.karma.tsx rename to packages/main/src/webComponents/ShellBar/ShellBar.karma.tsx diff --git a/packages/fiori3/src/webComponents/ShellBar/demo.stories.tsx b/packages/main/src/webComponents/ShellBar/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ShellBar/demo.stories.tsx rename to packages/main/src/webComponents/ShellBar/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/ShellBar/index.tsx b/packages/main/src/webComponents/ShellBar/index.tsx similarity index 96% rename from packages/fiori3/src/webComponents/ShellBar/index.tsx rename to packages/main/src/webComponents/ShellBar/index.tsx index 39681c1b788..5275690da4a 100644 --- a/packages/fiori3/src/webComponents/ShellBar/index.tsx +++ b/packages/main/src/webComponents/ShellBar/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5ShellBar from '@ui5/webcomponents/dist/ShellBar'; import React, { FC, ReactNode, ReactNodeArray } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/ShellBarItem/ShellBarItem.karma.tsx b/packages/main/src/webComponents/ShellBarItem/ShellBarItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ShellBarItem/ShellBarItem.karma.tsx rename to packages/main/src/webComponents/ShellBarItem/ShellBarItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/ShellBarItem/index.tsx b/packages/main/src/webComponents/ShellBarItem/index.tsx similarity index 91% rename from packages/fiori3/src/webComponents/ShellBarItem/index.tsx rename to packages/main/src/webComponents/ShellBarItem/index.tsx index b4426aa2224..0f28421a819 100644 --- a/packages/fiori3/src/webComponents/ShellBarItem/index.tsx +++ b/packages/main/src/webComponents/ShellBarItem/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5ShellBarItem from '@ui5/webcomponents/dist/ShellBarItem'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/StandardListItem/StandardListItem.karma.tsx b/packages/main/src/webComponents/StandardListItem/StandardListItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/StandardListItem/StandardListItem.karma.tsx rename to packages/main/src/webComponents/StandardListItem/StandardListItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/StandardListItem/index.tsx b/packages/main/src/webComponents/StandardListItem/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/StandardListItem/index.tsx rename to packages/main/src/webComponents/StandardListItem/index.tsx diff --git a/packages/fiori3/src/webComponents/Switch/Switch.karma.tsx b/packages/main/src/webComponents/Switch/Switch.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Switch/Switch.karma.tsx rename to packages/main/src/webComponents/Switch/Switch.karma.tsx diff --git a/packages/fiori3/src/webComponents/Switch/demo.stories.tsx b/packages/main/src/webComponents/Switch/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Switch/demo.stories.tsx rename to packages/main/src/webComponents/Switch/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Switch/index.tsx b/packages/main/src/webComponents/Switch/index.tsx similarity index 91% rename from packages/fiori3/src/webComponents/Switch/index.tsx rename to packages/main/src/webComponents/Switch/index.tsx index 0b293e46c40..519b60dee5d 100644 --- a/packages/fiori3/src/webComponents/Switch/index.tsx +++ b/packages/main/src/webComponents/Switch/index.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Switch from '@ui5/webcomponents/dist/Switch'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Tab/Tab.karma.tsx b/packages/main/src/webComponents/Tab/Tab.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Tab/Tab.karma.tsx rename to packages/main/src/webComponents/Tab/Tab.karma.tsx diff --git a/packages/fiori3/src/webComponents/Tab/index.tsx b/packages/main/src/webComponents/Tab/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Tab/index.tsx rename to packages/main/src/webComponents/Tab/index.tsx diff --git a/packages/fiori3/src/webComponents/TabBase/TabBase.karma.tsx b/packages/main/src/webComponents/TabBase/TabBase.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabBase/TabBase.karma.tsx rename to packages/main/src/webComponents/TabBase/TabBase.karma.tsx diff --git a/packages/fiori3/src/webComponents/TabBase/index.tsx b/packages/main/src/webComponents/TabBase/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabBase/index.tsx rename to packages/main/src/webComponents/TabBase/index.tsx diff --git a/packages/fiori3/src/webComponents/TabContainer/TabContainer.karma.tsx b/packages/main/src/webComponents/TabContainer/TabContainer.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabContainer/TabContainer.karma.tsx rename to packages/main/src/webComponents/TabContainer/TabContainer.karma.tsx diff --git a/packages/fiori3/src/webComponents/TabContainer/demo.stories.tsx b/packages/main/src/webComponents/TabContainer/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabContainer/demo.stories.tsx rename to packages/main/src/webComponents/TabContainer/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/TabContainer/index.tsx b/packages/main/src/webComponents/TabContainer/index.tsx similarity index 91% rename from packages/fiori3/src/webComponents/TabContainer/index.tsx rename to packages/main/src/webComponents/TabContainer/index.tsx index 3ddfb5f2c73..04d8bc532e4 100644 --- a/packages/fiori3/src/webComponents/TabContainer/index.tsx +++ b/packages/main/src/webComponents/TabContainer/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5TabContainer from '@ui5/webcomponents/dist/TabContainer'; import React, { ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/TabSeparator/TabSeparator.karma.tsx b/packages/main/src/webComponents/TabSeparator/TabSeparator.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabSeparator/TabSeparator.karma.tsx rename to packages/main/src/webComponents/TabSeparator/TabSeparator.karma.tsx diff --git a/packages/fiori3/src/webComponents/TabSeparator/index.tsx b/packages/main/src/webComponents/TabSeparator/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TabSeparator/index.tsx rename to packages/main/src/webComponents/TabSeparator/index.tsx diff --git a/packages/fiori3/src/webComponents/Table/Table.karma.tsx b/packages/main/src/webComponents/Table/Table.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Table/Table.karma.tsx rename to packages/main/src/webComponents/Table/Table.karma.tsx diff --git a/packages/fiori3/src/webComponents/Table/demo.stories.tsx b/packages/main/src/webComponents/Table/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Table/demo.stories.tsx rename to packages/main/src/webComponents/Table/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Table/index.tsx b/packages/main/src/webComponents/Table/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Table/index.tsx rename to packages/main/src/webComponents/Table/index.tsx diff --git a/packages/fiori3/src/webComponents/TableCell/TableCell.karma.tsx b/packages/main/src/webComponents/TableCell/TableCell.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableCell/TableCell.karma.tsx rename to packages/main/src/webComponents/TableCell/TableCell.karma.tsx diff --git a/packages/fiori3/src/webComponents/TableCell/index.tsx b/packages/main/src/webComponents/TableCell/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableCell/index.tsx rename to packages/main/src/webComponents/TableCell/index.tsx diff --git a/packages/fiori3/src/webComponents/TableColumn/TableColumn.karma.tsx b/packages/main/src/webComponents/TableColumn/TableColumn.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableColumn/TableColumn.karma.tsx rename to packages/main/src/webComponents/TableColumn/TableColumn.karma.tsx diff --git a/packages/fiori3/src/webComponents/TableColumn/index.tsx b/packages/main/src/webComponents/TableColumn/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableColumn/index.tsx rename to packages/main/src/webComponents/TableColumn/index.tsx diff --git a/packages/fiori3/src/webComponents/TableRow/TableRow.karma.tsx b/packages/main/src/webComponents/TableRow/TableRow.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableRow/TableRow.karma.tsx rename to packages/main/src/webComponents/TableRow/TableRow.karma.tsx diff --git a/packages/fiori3/src/webComponents/TableRow/index.tsx b/packages/main/src/webComponents/TableRow/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TableRow/index.tsx rename to packages/main/src/webComponents/TableRow/index.tsx diff --git a/packages/fiori3/src/webComponents/TextArea/TextArea.karma.tsx b/packages/main/src/webComponents/TextArea/TextArea.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TextArea/TextArea.karma.tsx rename to packages/main/src/webComponents/TextArea/TextArea.karma.tsx diff --git a/packages/fiori3/src/webComponents/TextArea/demo.stories.tsx b/packages/main/src/webComponents/TextArea/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TextArea/demo.stories.tsx rename to packages/main/src/webComponents/TextArea/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/TextArea/index.tsx b/packages/main/src/webComponents/TextArea/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/TextArea/index.tsx rename to packages/main/src/webComponents/TextArea/index.tsx index 16d3e9b203a..2a756f07b7c 100644 --- a/packages/fiori3/src/webComponents/TextArea/index.tsx +++ b/packages/main/src/webComponents/TextArea/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5TextArea from '@ui5/webcomponents/dist/TextArea'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Timeline/Timeline.karma.tsx b/packages/main/src/webComponents/Timeline/Timeline.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Timeline/Timeline.karma.tsx rename to packages/main/src/webComponents/Timeline/Timeline.karma.tsx diff --git a/packages/fiori3/src/webComponents/Timeline/demo.stories.tsx b/packages/main/src/webComponents/Timeline/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Timeline/demo.stories.tsx rename to packages/main/src/webComponents/Timeline/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Timeline/index.tsx b/packages/main/src/webComponents/Timeline/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Timeline/index.tsx rename to packages/main/src/webComponents/Timeline/index.tsx diff --git a/packages/fiori3/src/webComponents/TimelineItem/TimelineItem.karma.tsx b/packages/main/src/webComponents/TimelineItem/TimelineItem.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/TimelineItem/TimelineItem.karma.tsx rename to packages/main/src/webComponents/TimelineItem/TimelineItem.karma.tsx diff --git a/packages/fiori3/src/webComponents/TimelineItem/index.tsx b/packages/main/src/webComponents/TimelineItem/index.tsx similarity index 93% rename from packages/fiori3/src/webComponents/TimelineItem/index.tsx rename to packages/main/src/webComponents/TimelineItem/index.tsx index 6ef899650b1..6bbebc0bd8f 100644 --- a/packages/fiori3/src/webComponents/TimelineItem/index.tsx +++ b/packages/main/src/webComponents/TimelineItem/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5TimelineItem from '@ui5/webcomponents/dist/TimelineItem'; import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Title/Title.karma.tsx b/packages/main/src/webComponents/Title/Title.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Title/Title.karma.tsx rename to packages/main/src/webComponents/Title/Title.karma.tsx diff --git a/packages/fiori3/src/webComponents/Title/demo.stories.tsx b/packages/main/src/webComponents/Title/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Title/demo.stories.tsx rename to packages/main/src/webComponents/Title/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Title/index.tsx b/packages/main/src/webComponents/Title/index.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Title/index.tsx rename to packages/main/src/webComponents/Title/index.tsx diff --git a/packages/fiori3/src/webComponents/ToggleButton/ToggleButton.karma.tsx b/packages/main/src/webComponents/ToggleButton/ToggleButton.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ToggleButton/ToggleButton.karma.tsx rename to packages/main/src/webComponents/ToggleButton/ToggleButton.karma.tsx diff --git a/packages/fiori3/src/webComponents/ToggleButton/demo.stories.tsx b/packages/main/src/webComponents/ToggleButton/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/ToggleButton/demo.stories.tsx rename to packages/main/src/webComponents/ToggleButton/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/ToggleButton/index.tsx b/packages/main/src/webComponents/ToggleButton/index.tsx similarity index 94% rename from packages/fiori3/src/webComponents/ToggleButton/index.tsx rename to packages/main/src/webComponents/ToggleButton/index.tsx index 658334ea48f..0f5594018e3 100644 --- a/packages/fiori3/src/webComponents/ToggleButton/index.tsx +++ b/packages/main/src/webComponents/ToggleButton/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { ButtonDesign } from '../../lib/ButtonDesign'; -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5ToggleButton from '@ui5/webcomponents/dist/ToggleButton'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Token/Token.karma.tsx b/packages/main/src/webComponents/Token/Token.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Token/Token.karma.tsx rename to packages/main/src/webComponents/Token/Token.karma.tsx diff --git a/packages/fiori3/src/webComponents/Token/demo.stories.tsx b/packages/main/src/webComponents/Token/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Token/demo.stories.tsx rename to packages/main/src/webComponents/Token/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Token/index.tsx b/packages/main/src/webComponents/Token/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/Token/index.tsx rename to packages/main/src/webComponents/Token/index.tsx index f912856a328..a75e70a409e 100644 --- a/packages/fiori3/src/webComponents/Token/index.tsx +++ b/packages/main/src/webComponents/Token/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Token from '@ui5/webcomponents/dist/Token'; import React, { FC, ReactNode, ReactNodeArray } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/Tokenizer/Tokenizer.karma.tsx b/packages/main/src/webComponents/Tokenizer/Tokenizer.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Tokenizer/Tokenizer.karma.tsx rename to packages/main/src/webComponents/Tokenizer/Tokenizer.karma.tsx diff --git a/packages/fiori3/src/webComponents/Tokenizer/demo.stories.tsx b/packages/main/src/webComponents/Tokenizer/demo.stories.tsx similarity index 100% rename from packages/fiori3/src/webComponents/Tokenizer/demo.stories.tsx rename to packages/main/src/webComponents/Tokenizer/demo.stories.tsx diff --git a/packages/fiori3/src/webComponents/Tokenizer/index.tsx b/packages/main/src/webComponents/Tokenizer/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/Tokenizer/index.tsx rename to packages/main/src/webComponents/Tokenizer/index.tsx index 5fd1f9282f3..575881d54f5 100644 --- a/packages/fiori3/src/webComponents/Tokenizer/index.tsx +++ b/packages/main/src/webComponents/Tokenizer/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5Tokenizer from '@ui5/webcomponents/dist/Tokenizer'; import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/src/webComponents/YearPicker/YearPicker.karma.tsx b/packages/main/src/webComponents/YearPicker/YearPicker.karma.tsx similarity index 100% rename from packages/fiori3/src/webComponents/YearPicker/YearPicker.karma.tsx rename to packages/main/src/webComponents/YearPicker/YearPicker.karma.tsx diff --git a/packages/fiori3/src/webComponents/YearPicker/index.tsx b/packages/main/src/webComponents/YearPicker/index.tsx similarity index 92% rename from packages/fiori3/src/webComponents/YearPicker/index.tsx rename to packages/main/src/webComponents/YearPicker/index.tsx index 4cbc662ccb9..a24f454fe69 100644 --- a/packages/fiori3/src/webComponents/YearPicker/index.tsx +++ b/packages/main/src/webComponents/YearPicker/index.tsx @@ -1,4 +1,4 @@ -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import UI5YearPicker from '@ui5/webcomponents/dist/YearPicker'; import React, { FC } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; diff --git a/packages/fiori3/test/snapshot-serializer.js b/packages/main/test/snapshot-serializer.js similarity index 100% rename from packages/fiori3/test/snapshot-serializer.js rename to packages/main/test/snapshot-serializer.js diff --git a/packages/fiori3/test/testRunner.js b/packages/main/test/testRunner.js similarity index 100% rename from packages/fiori3/test/testRunner.js rename to packages/main/test/testRunner.js diff --git a/packages/fiori3/tsconfig.json b/packages/main/tsconfig.json similarity index 100% rename from packages/fiori3/tsconfig.json rename to packages/main/tsconfig.json diff --git a/scripts/ci/release-npm-next-tag.sh b/scripts/ci/release-npm-next-tag.sh index 489e01b2819..7377d6fd5c3 100644 --- a/scripts/ci/release-npm-next-tag.sh +++ b/scripts/ci/release-npm-next-tag.sh @@ -24,7 +24,7 @@ git push --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" "$TRAVIS #git push --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" "release/${PACKAGE_VERSION}" > /dev/null 2>&1; cd ${TRAVIS_BUILD_DIR}/build/node_modules/charts && npm publish --access public --tag next -cd ${TRAVIS_BUILD_DIR}/build/node_modules/fiori3 && npm publish --access public --tag next +cd ${TRAVIS_BUILD_DIR}/build/node_modules/main && npm publish --access public --tag next cd ${TRAVIS_BUILD_DIR}/build/node_modules/base && npm publish --access public --tag next #curl --request POST \ diff --git a/scripts/ci/release.sh b/scripts/ci/release.sh index b9d9d11f179..2f4bae99848 100755 --- a/scripts/ci/release.sh +++ b/scripts/ci/release.sh @@ -34,7 +34,7 @@ bash ${WORKSPACE}/scripts/ci/setup-npm.sh # now start publishing each package cd ${WORKSPACE}/build/node_modules/charts && npm publish --access public -cd ${WORKSPACE}/build/node_modules/fiori3 && npm publish --access public +cd ${WORKSPACE}/build/node_modules/main && npm publish --access public cd ${WORKSPACE}/build/node_modules/base && npm publish --access public diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 1e9d9be34d2..c0d77689afb 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -9,16 +9,16 @@ const bundleTypes = { const bundles = [ { - label: 'fiori3', + label: 'main', bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES_DEV, bundleTypes.NODE_ES_PROD], - entry: 'fiori3', + entry: 'main', global: 'FioriForReact', externals: [ 'react', 'react-dom', 'react-jss', '@ui5/webcomponents-base', - '@ui5-webcomponents-react/base', + '@ui5/webcomponents-react-base', 'react-table' ] }, diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js index 9d82586dfe1..8c2c4bb52f3 100755 --- a/scripts/rollup/packaging.js +++ b/scripts/rollup/packaging.js @@ -52,8 +52,8 @@ async function prepareNpmPackages() { } const builtPackageFolders = readdirSync('build/node_modules').filter((dir) => dir.charAt(0) !== '.'); await Promise.all(builtPackageFolders.map(prepareNpmPackage)); - // create fiori3 lib - await asyncExecuteCommand(`node_modules/.bin/rollup -c packages/fiori3/rollup.config.js`); + // create main lib + await asyncExecuteCommand(`node_modules/.bin/rollup -c packages/main/rollup.config.js`); } module.exports = { diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index e366fc80bf1..4b5331d805e 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -1,144 +1,88 @@ { "bundleSizes": [ - { - "filename": "fiori3.development.js", - "bundleType": "NODE_ES_DEV", - "packageName": "fiori3", - "size": 186569, - "gzip": 32486 - }, - { - "filename": "fiori3.production.min.js", - "bundleType": "NODE_ES_PROD", - "packageName": "fiori3", - "size": 186569, - "gzip": 32486 - }, - { - "filename": "fiori3.development.js", - "bundleType": "NODE_DEV", - "packageName": "fiori3", - "size": 189774, - "gzip": 32538 - }, - { - "filename": "fiori3.production.min.js", - "bundleType": "NODE_PROD", - "packageName": "fiori3", - "size": 98745, - "gzip": 24984 - }, - { - "filename": "styles.development.js", - "bundleType": "NODE_ES_DEV", - "packageName": "styles", - "size": 190238, - "gzip": 28376 - }, - { - "filename": "styles.production.min.js", - "bundleType": "NODE_ES_PROD", - "packageName": "styles", - "size": 189978, - "gzip": 28219 - }, - { - "filename": "styles.development.js", - "bundleType": "NODE_DEV", - "packageName": "styles", - "size": 190514, - "gzip": 28446 - }, - { - "filename": "styles.production.min.js", - "bundleType": "NODE_PROD", - "packageName": "styles", - "size": 68670, - "gzip": 15710 - }, - { - "filename": "utils.development.js", - "bundleType": "NODE_ES_DEV", - "packageName": "utils", - "size": 50257, - "gzip": 11582 - }, - { - "filename": "utils.production.min.js", - "bundleType": "NODE_ES_PROD", - "packageName": "utils", - "size": 50257, - "gzip": 11582 - }, - { - "filename": "utils.development.js", - "bundleType": "NODE_DEV", - "packageName": "utils", - "size": 50696, - "gzip": 11660 - }, - { - "filename": "utils.production.min.js", - "bundleType": "NODE_PROD", - "packageName": "utils", - "size": 24750, - "gzip": 8837 - }, { "filename": "charts.development.js", "bundleType": "NODE_ES_DEV", "packageName": "charts", "size": 68878, - "gzip": 13359 + "gzip": 13360 }, { "filename": "charts.production.min.js", "bundleType": "NODE_ES_PROD", "packageName": "charts", "size": 68878, - "gzip": 13359 + "gzip": 13360 }, { "filename": "charts.development.js", "bundleType": "NODE_DEV", "packageName": "charts", - "size": 69236, - "gzip": 13354 + "size": 69398, + "gzip": 13370 }, { "filename": "charts.production.min.js", "bundleType": "NODE_PROD", "packageName": "charts", "size": 35355, - "gzip": 8887 + "gzip": 8886 }, { "filename": "base.development.js", "bundleType": "NODE_ES_DEV", "packageName": "base", - "size": 298977, - "gzip": 55829 + "size": 211441, + "gzip": 46069 }, { "filename": "base.production.min.js", "bundleType": "NODE_ES_PROD", "packageName": "base", - "size": 298719, - "gzip": 55708 + "size": 211261, + "gzip": 45963 }, { "filename": "base.development.js", "bundleType": "NODE_DEV", "packageName": "base", - "size": 299743, - "gzip": 55948 + "size": 212048, + "gzip": 46154 }, { "filename": "base.production.min.js", "bundleType": "NODE_PROD", "packageName": "base", - "size": 115584, - "gzip": 30590 + "size": 86402, + "gzip": 25866 + }, + { + "filename": "main.development.js", + "bundleType": "NODE_ES_DEV", + "packageName": "main", + "size": 186567, + "gzip": 32438 + }, + { + "filename": "main.production.min.js", + "bundleType": "NODE_ES_PROD", + "packageName": "main", + "size": 186567, + "gzip": 32438 + }, + { + "filename": "main.development.js", + "bundleType": "NODE_DEV", + "packageName": "main", + "size": 192174, + "gzip": 32563 + }, + { + "filename": "main.production.min.js", + "bundleType": "NODE_PROD", + "packageName": "main", + "size": 98840, + "gzip": 24961 } ] -} \ No newline at end of file +} diff --git a/shared/tests/utils.tsx b/shared/tests/utils.tsx index fe0f88a2e27..16affcc79ed 100644 --- a/shared/tests/utils.tsx +++ b/shared/tests/utils.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { Event } from '@ui5-webcomponents-react/base'; +import { Event } from '@ui5/webcomponents-react-base'; import { mount, shallow } from 'enzyme'; -import { ThemeProvider } from '../../packages/fiori3/src/lib/ThemeProvider'; +import { ThemeProvider } from '../../packages/main/src/lib/ThemeProvider'; export const modifyObjectProperty = (object: any, attr: string, value: any) => { Object.defineProperty(object, attr, {