refactor(base): flatten project structure (#227)

BREAKING CHANGE: All files required from the base now have different path. sap/ui/webcomponents/base/ is removed. old: @ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent new: @ui5/webcomponents-base/src/WebComponent
SAP · Mar 22, 2019 · 0e8e460 · 0e8e460
1 parent 839a66e
commit 0e8e460
Show file tree

Hide file tree

Showing 163 changed files with 250 additions and 250 deletions.
diff --git a/README.md b/README.md
@@ -66,21 +66,21 @@ If your application should run on browsers without native Web Components support
 ### Edge only
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/Edge";
+import "@ui5/webcomponents-base/src/browsersupport/Edge";
 ```
 
 ### Edge and IE11
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/IE11";
+import "@ui5/webcomponents-base/src/browsersupport/IE11";
 ```
 
 *Note:* Importing the module for IE11 support automatically enables Edge support as well, so there is no need to import them both explicitly.
 
 Example:
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/IE11"; // This will enable Edge and IE11 support for all Web Components below
+import "@ui5/webcomponents-base/src/browsersupport/IE11"; // This will enable Edge and IE11 support for all Web Components below
 import "@ui5/webcomponents/dist/Button"; // loads ui5-button
 import "@ui5/webcomponents/dist/Label"; // loads ui5-label
 ```

diff --git a/packages/base/.eslintignore b/packages/base/.eslintignore
@@ -1,3 +1,3 @@
 # Note: Changes to this file also must be applied to the top level .eslintignore file.
 test
-src/sap/ui/webcomponents/base/thirdparty
+src/thirdparty
diff --git a/...rc/sap/ui/webcomponents/base/Bootstrap.js → packages/base/src/Bootstrap.js b/...rc/sap/ui/webcomponents/base/Bootstrap.js → packages/base/src/Bootstrap.js
diff --git a/...ase/src/sap/ui/webcomponents/base/CLDR.js → packages/base/src/CLDR.js b/...ase/src/sap/ui/webcomponents/base/CLDR.js → packages/base/src/CLDR.js
diff --git a/...ap/ui/webcomponents/base/Configuration.js → packages/base/src/Configuration.js b/...ap/ui/webcomponents/base/Configuration.js → packages/base/src/Configuration.js
diff --git a/.../ui/webcomponents/base/ControlRenderer.js → packages/base/src/ControlRenderer.js b/.../ui/webcomponents/base/ControlRenderer.js → packages/base/src/ControlRenderer.js
diff --git a/.../ui/webcomponents/base/DOMEventHandler.js → packages/base/src/DOMEventHandler.js b/.../ui/webcomponents/base/DOMEventHandler.js → packages/base/src/DOMEventHandler.js
diff --git a/...ap/ui/webcomponents/base/EventProvider.js → packages/base/src/EventProvider.js b/...ap/ui/webcomponents/base/EventProvider.js → packages/base/src/EventProvider.js
diff --git a/.../sap/ui/webcomponents/base/FocusHelper.js → packages/base/src/FocusHelper.js b/.../sap/ui/webcomponents/base/FocusHelper.js → packages/base/src/FocusHelper.js
diff --git a/...p/ui/webcomponents/base/FormatSettings.js → packages/base/src/FormatSettings.js b/...p/ui/webcomponents/base/FormatSettings.js → packages/base/src/FormatSettings.js
diff --git a/...rc/sap/ui/webcomponents/base/IconFonts.js → packages/base/src/IconFonts.js b/...rc/sap/ui/webcomponents/base/IconFonts.js → packages/base/src/IconFonts.js
diff --git a/...src/sap/ui/webcomponents/base/IconPool.js → packages/base/src/IconPool.js b/...src/sap/ui/webcomponents/base/IconPool.js → packages/base/src/IconPool.js
diff --git a/.../ui/webcomponents/base/LabelEnablement.js → packages/base/src/LabelEnablement.js b/.../ui/webcomponents/base/LabelEnablement.js → packages/base/src/LabelEnablement.js
diff --git a/...e/src/sap/ui/webcomponents/base/Locale.js → packages/base/src/Locale.js b/...e/src/sap/ui/webcomponents/base/Locale.js → packages/base/src/Locale.js
diff --git a/...p/ui/webcomponents/base/LocaleProvider.js → packages/base/src/LocaleProvider.js b/...p/ui/webcomponents/base/LocaleProvider.js → packages/base/src/LocaleProvider.js
diff --git a/.../sap/ui/webcomponents/base/RenderQueue.js → packages/base/src/RenderQueue.js b/.../sap/ui/webcomponents/base/RenderQueue.js → packages/base/src/RenderQueue.js
diff --git a/.../ui/webcomponents/base/RenderScheduler.js → packages/base/src/RenderScheduler.js b/.../ui/webcomponents/base/RenderScheduler.js → packages/base/src/RenderScheduler.js
diff --git a/...p/ui/webcomponents/base/ResourceBundle.js → packages/base/src/ResourceBundle.js b/...p/ui/webcomponents/base/ResourceBundle.js → packages/base/src/ResourceBundle.js
diff --git a/...omponents/base/ResourceLoaderOverrides.js → packages/base/src/ResourceLoaderOverrides.js b/...omponents/base/ResourceLoaderOverrides.js → packages/base/src/ResourceLoaderOverrides.js
diff --git a/...se/src/sap/ui/webcomponents/base/State.js → packages/base/src/State.js b/...se/src/sap/ui/webcomponents/base/State.js → packages/base/src/State.js
diff --git a/.../ui/webcomponents/base/TemplateContext.js → packages/base/src/TemplateContext.js b/.../ui/webcomponents/base/TemplateContext.js → packages/base/src/TemplateContext.js
diff --git a/.../src/sap/ui/webcomponents/base/Theming.js → packages/base/src/Theming.js b/.../src/sap/ui/webcomponents/base/Theming.js → packages/base/src/Theming.js
diff --git a/...sap/ui/webcomponents/base/WebComponent.js → packages/base/src/WebComponent.js b/...sap/ui/webcomponents/base/WebComponent.js → packages/base/src/WebComponent.js
diff --git a/...ebcomponents/base/WebComponentMetadata.js → packages/base/src/WebComponentMetadata.js b/...ebcomponents/base/WebComponentMetadata.js → packages/base/src/WebComponentMetadata.js
diff --git a/...ponents/base/animations/AnimationQueue.js → ...ges/base/src/animations/AnimationQueue.js b/...ponents/base/animations/AnimationQueue.js → ...ges/base/src/animations/AnimationQueue.js
diff --git a/.../webcomponents/base/animations/animate.js → packages/base/src/animations/animate.js b/.../webcomponents/base/animations/animate.js → packages/base/src/animations/animate.js
diff --git a/...i/webcomponents/base/animations/config.js → packages/base/src/animations/config.js b/...i/webcomponents/base/animations/config.js → packages/base/src/animations/config.js
diff --git a/...i/webcomponents/base/animations/scroll.js → packages/base/src/animations/scroll.js b/...i/webcomponents/base/animations/scroll.js → packages/base/src/animations/scroll.js
diff --git a/...ebcomponents/base/animations/slideDown.js → packages/base/src/animations/slideDown.js b/...ebcomponents/base/animations/slideDown.js → packages/base/src/animations/slideDown.js
diff --git a/.../webcomponents/base/animations/slideUp.js → packages/base/src/animations/slideUp.js b/.../webcomponents/base/animations/slideUp.js → packages/base/src/animations/slideUp.js
diff --git a/...webcomponents/base/browsersupport/Edge.js → packages/base/src/browsersupport/Edge.js b/...webcomponents/base/browsersupport/Edge.js → packages/base/src/browsersupport/Edge.js
diff --git a/...webcomponents/base/browsersupport/IE11.js → packages/base/src/browsersupport/IE11.js b/...webcomponents/base/browsersupport/IE11.js → packages/base/src/browsersupport/IE11.js
diff --git a/...s/base/compatibility/CSSVarsSimulation.js → ...se/src/compatibility/CSSVarsSimulation.js b/...s/base/compatibility/CSSVarsSimulation.js → ...se/src/compatibility/CSSVarsSimulation.js
diff --git a/...ponents/base/compatibility/DOMObserver.js → ...ges/base/src/compatibility/DOMObserver.js b/...ponents/base/compatibility/DOMObserver.js → ...ges/base/src/compatibility/DOMObserver.js
diff --git a/...omponents/base/compatibility/ShadowDOM.js → packages/base/src/compatibility/ShadowDOM.js b/...omponents/base/compatibility/ShadowDOM.js → packages/base/src/compatibility/ShadowDOM.js
diff --git a/...ents/base/compatibility/patchNodeValue.js → .../base/src/compatibility/patchNodeValue.js b/...ents/base/compatibility/patchNodeValue.js → .../base/src/compatibility/patchNodeValue.js
diff --git a/.../base/compatibility/whenPolyfillLoaded.js → ...e/src/compatibility/whenPolyfillLoaded.js b/.../base/compatibility/whenPolyfillLoaded.js → ...e/src/compatibility/whenPolyfillLoaded.js
diff --git a/.../webcomponents/base/dates/CalendarDate.js → packages/base/src/dates/CalendarDate.js b/.../webcomponents/base/dates/CalendarDate.js → packages/base/src/dates/CalendarDate.js
diff --git a/...nents/base/dates/CalendarDatesRegistry.js → ...s/base/src/dates/CalendarDatesRegistry.js b/...nents/base/dates/CalendarDatesRegistry.js → ...s/base/src/dates/CalendarDatesRegistry.js
diff --git a/.../webcomponents/base/dates/CalendarType.js → packages/base/src/dates/CalendarType.js b/.../webcomponents/base/dates/CalendarType.js → packages/base/src/dates/CalendarType.js
diff --git a/...webcomponents/base/dates/CalendarUtils.js → packages/base/src/dates/CalendarUtils.js b/...webcomponents/base/dates/CalendarUtils.js → packages/base/src/dates/CalendarUtils.js
diff --git a/...bcomponents/base/delegate/CustomResize.js → packages/base/src/delegate/CustomResize.js b/...bcomponents/base/delegate/CustomResize.js → packages/base/src/delegate/CustomResize.js
diff --git a/...omponents/base/delegate/ItemNavigation.js → packages/base/src/delegate/ItemNavigation.js b/...omponents/base/delegate/ItemNavigation.js → packages/base/src/delegate/ItemNavigation.js
diff --git a/...bcomponents/base/delegate/NativeResize.js → packages/base/src/delegate/NativeResize.js b/...bcomponents/base/delegate/NativeResize.js → packages/base/src/delegate/NativeResize.js
diff --git a/...components/base/delegate/ResizeHandler.js → packages/base/src/delegate/ResizeHandler.js b/...components/base/delegate/ResizeHandler.js → packages/base/src/delegate/ResizeHandler.js
diff --git a/...ponents/base/delegate/ScrollEnablement.js → ...ges/base/src/delegate/ScrollEnablement.js b/...ponents/base/delegate/ScrollEnablement.js → ...ges/base/src/delegate/ScrollEnablement.js
diff --git a/...ebcomponents/base/events/ControlEvents.js → packages/base/src/events/ControlEvents.js b/...ebcomponents/base/events/ControlEvents.js → packages/base/src/events/ControlEvents.js
diff --git a/...components/base/events/EventEnrichment.js → packages/base/src/events/EventEnrichment.js b/...components/base/events/EventEnrichment.js → packages/base/src/events/EventEnrichment.js
diff --git a/...webcomponents/base/events/PseudoEvents.js → packages/base/src/events/PseudoEvents.js b/...webcomponents/base/events/PseudoEvents.js → packages/base/src/events/PseudoEvents.js
diff --git a/...nts/base/events/getOriginalEventTarget.js → ...base/src/events/getOriginalEventTarget.js b/...nts/base/events/getOriginalEventTarget.js → ...base/src/events/getOriginalEventTarget.js
diff --git a/...mponents/base/iconfonts/SAP-icons.woff.js → ...ages/base/src/iconfonts/SAP-icons.woff.js b/...mponents/base/iconfonts/SAP-icons.woff.js → ...ages/base/src/iconfonts/SAP-icons.woff.js
diff --git a/...ponents/base/iconfonts/SAP-icons.woff2.js → ...ges/base/src/iconfonts/SAP-icons.woff2.js b/...ponents/base/iconfonts/SAP-icons.woff2.js → ...ges/base/src/iconfonts/SAP-icons.woff2.js
diff --git a/...ebcomponents/base/renderer/LitRenderer.js → packages/base/src/renderer/LitRenderer.js b/...ebcomponents/base/renderer/LitRenderer.js → packages/base/src/renderer/LitRenderer.js
diff --git a/...i/webcomponents/base/renderer/ifTruthy.js → packages/base/src/renderer/ifTruthy.js b/...i/webcomponents/base/renderer/ifTruthy.js → packages/base/src/renderer/ifTruthy.js
diff --git a/.../ui/webcomponents/base/shims/Core-shim.js → packages/base/src/shims/Core-shim.js b/.../ui/webcomponents/base/shims/Core-shim.js → packages/base/src/shims/Core-shim.js
diff --git a/...i/webcomponents/base/shims/jquery-shim.js → packages/base/src/shims/jquery-shim.js b/...i/webcomponents/base/shims/jquery-shim.js → packages/base/src/shims/jquery-shim.js
diff --git a/...webcomponents/base/theming/CustomStyle.js → packages/base/src/theming/CustomStyle.js b/...webcomponents/base/theming/CustomStyle.js → packages/base/src/theming/CustomStyle.js
diff --git a/...components/base/theming/StyleInjection.js → packages/base/src/theming/StyleInjection.js b/...components/base/theming/StyleInjection.js → packages/base/src/theming/StyleInjection.js
diff --git a/...webcomponents/base/theming/ThemeBundle.js → packages/base/src/theming/ThemeBundle.js b/...webcomponents/base/theming/ThemeBundle.js → packages/base/src/theming/ThemeBundle.js
diff --git a/...omponents/base/theming/ThemeProperties.js → packages/base/src/theming/ThemeProperties.js b/...omponents/base/theming/ThemeProperties.js → packages/base/src/theming/ThemeProperties.js
diff --git a/...bcomponents/base/thirdparty/Array.from.js → packages/base/src/thirdparty/Array.from.js b/...bcomponents/base/thirdparty/Array.from.js → packages/base/src/thirdparty/Array.from.js
diff --git a/...s/base/thirdparty/Array.prototype.fill.js → ...se/src/thirdparty/Array.prototype.fill.js b/...s/base/thirdparty/Array.prototype.fill.js → ...se/src/thirdparty/Array.prototype.fill.js
diff --git a/...se/thirdparty/Array.prototype.includes.js → ...rc/thirdparty/Array.prototype.includes.js b/...se/thirdparty/Array.prototype.includes.js → ...rc/thirdparty/Array.prototype.includes.js
diff --git a/...e/thirdparty/Element.prototype.closest.js → ...c/thirdparty/Element.prototype.closest.js b/...e/thirdparty/Element.prototype.closest.js → ...c/thirdparty/Element.prototype.closest.js
diff --git a/...e/thirdparty/Element.prototype.matches.js → ...c/thirdparty/Element.prototype.matches.js b/...e/thirdparty/Element.prototype.matches.js → ...c/thirdparty/Element.prototype.matches.js
diff --git a/...nents/base/thirdparty/Number.isInteger.js → ...s/base/src/thirdparty/Number.isInteger.js b/...nents/base/thirdparty/Number.isInteger.js → ...s/base/src/thirdparty/Number.isInteger.js
diff --git a/...omponents/base/thirdparty/Number.isNaN.js → packages/base/src/thirdparty/Number.isNaN.js b/...omponents/base/thirdparty/Number.isNaN.js → packages/base/src/thirdparty/Number.isNaN.js
diff --git a/...onents/base/thirdparty/Number.parseInt.js → ...es/base/src/thirdparty/Number.parseInt.js b/...onents/base/thirdparty/Number.parseInt.js → ...es/base/src/thirdparty/Number.parseInt.js
diff --git a/...mponents/base/thirdparty/Object.assign.js → ...ages/base/src/thirdparty/Object.assign.js b/...mponents/base/thirdparty/Object.assign.js → ...ages/base/src/thirdparty/Object.assign.js
diff --git a/...ponents/base/thirdparty/Object.entries.js → ...ges/base/src/thirdparty/Object.entries.js b/...ponents/base/thirdparty/Object.entries.js → ...ges/base/src/thirdparty/Object.entries.js
diff --git a/...i/webcomponents/base/thirdparty/Symbol.js → packages/base/src/thirdparty/Symbol.js b/...i/webcomponents/base/thirdparty/Symbol.js → packages/base/src/thirdparty/Symbol.js
diff --git a/.../webcomponents/base/thirdparty/WeakSet.js → packages/base/src/thirdparty/WeakSet.js b/.../webcomponents/base/thirdparty/WeakSet.js → packages/base/src/thirdparty/WeakSet.js
diff --git a/...ts/base/thirdparty/custom-elements.min.js → ...ase/src/thirdparty/custom-elements.min.js b/...ts/base/thirdparty/custom-elements.min.js → ...ase/src/thirdparty/custom-elements.min.js
diff --git a/...nents/base/thirdparty/events-polyfills.js → ...s/base/src/thirdparty/events-polyfills.js b/...nents/base/thirdparty/events-polyfills.js → ...s/base/src/thirdparty/events-polyfills.js
diff --git a/...ui/webcomponents/base/thirdparty/fetch.js → packages/base/src/thirdparty/fetch.js b/...ui/webcomponents/base/thirdparty/fetch.js → packages/base/src/thirdparty/fetch.js
diff --git a/...omponents/base/thirdparty/shadydom.min.js → packages/base/src/thirdparty/shadydom.min.js b/...omponents/base/thirdparty/shadydom.min.js → packages/base/src/thirdparty/shadydom.min.js
diff --git a/...webcomponents/base/thirdparty/template.js → packages/base/src/thirdparty/template.js b/...webcomponents/base/thirdparty/template.js → packages/base/src/thirdparty/template.js
diff --git a/...ap/ui/webcomponents/base/types/CSSSize.js → packages/base/src/types/CSSSize.js b/...ap/ui/webcomponents/base/types/CSSSize.js → packages/base/src/types/CSSSize.js
diff --git a/...p/ui/webcomponents/base/types/DataType.js → packages/base/src/types/DataType.js b/...p/ui/webcomponents/base/types/DataType.js → packages/base/src/types/DataType.js
diff --git a/...p/ui/webcomponents/base/types/Function.js → packages/base/src/types/Function.js b/...p/ui/webcomponents/base/types/Function.js → packages/base/src/types/Function.js
diff --git a/...ap/ui/webcomponents/base/types/Integer.js → packages/base/src/types/Integer.js b/...ap/ui/webcomponents/base/types/Integer.js → packages/base/src/types/Integer.js
diff --git a/...ui/webcomponents/base/types/PopupState.js → packages/base/src/types/PopupState.js b/...ui/webcomponents/base/types/PopupState.js → packages/base/src/types/PopupState.js
diff --git a/...rc/sap/ui/webcomponents/base/types/URI.js → packages/base/src/types/URI.js b/...rc/sap/ui/webcomponents/base/types/URI.js → packages/base/src/types/URI.js
diff --git a/...ui/webcomponents/base/types/ValueState.js → packages/base/src/types/ValueState.js b/...ui/webcomponents/base/types/ValueState.js → packages/base/src/types/ValueState.js
diff --git a/...ui/webcomponents/base/util/FetchHelper.js → packages/base/src/util/FetchHelper.js b/...ui/webcomponents/base/util/FetchHelper.js → packages/base/src/util/FetchHelper.js
diff --git a/...components/base/util/createStyleInHead.js → packages/base/src/util/createStyleInHead.js b/...components/base/util/createStyleInHead.js → packages/base/src/util/createStyleInHead.js
diff --git a/...i/webcomponents/base/util/setupBrowser.js → packages/base/src/util/setupBrowser.js b/...i/webcomponents/base/util/setupBrowser.js → packages/base/src/util/setupBrowser.js
diff --git a/...sap/ui/webcomponents/base/util/setupOS.js → packages/base/src/util/setupOS.js b/...sap/ui/webcomponents/base/util/setupOS.js → packages/base/src/util/setupOS.js
diff --git a/...ui/webcomponents/base/util/setupSystem.js → packages/base/src/util/setupSystem.js b/...ui/webcomponents/base/util/setupSystem.js → packages/base/src/util/setupSystem.js
diff --git a/...i/webcomponents/base/util/whenDOMReady.js → packages/base/src/util/whenDOMReady.js b/...i/webcomponents/base/util/whenDOMReady.js → packages/base/src/util/whenDOMReady.js
diff --git a/packages/main/README.md b/packages/main/README.md
@@ -66,21 +66,21 @@ If your application should run on browsers without native Web Components support
 ### Edge only
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/Edge";
+import "@ui5/webcomponents-base/src/browsersupport/Edge";
 ```
 
 ### Edge and IE11
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/IE11";
+import "@ui5/webcomponents-base/src/browsersupport/IE11";
 ```
 
 *Note:* Importing the module for IE11 support automatically enables Edge support as well, so there is no need to import them both explicitly.
 
 Example:
 
 ```js
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/IE11"; // This will enable Edge and IE11 support for all Web Components below
+import "@ui5/webcomponents-base/src/browsersupport/IE11"; // This will enable Edge and IE11 support for all Web Components below
 import "@ui5/webcomponents/dist/Button"; // loads ui5-button
 import "@ui5/webcomponents/dist/Label"; // loads ui5-label
 ```

diff --git a/packages/main/bundle.es5.js b/packages/main/bundle.es5.js
@@ -1,8 +1,8 @@
 // ES5 bundle targets IE11 only
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/IE11";
+import "@ui5/webcomponents-base/src/browsersupport/IE11";
 
-import * as configuration from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
-import * as Theming from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Theming";
+import * as configuration from "@ui5/webcomponents-base/src/Configuration";
+import * as Theming from "@ui5/webcomponents-base/src/Theming";
 import "./bundle.esm";
 
 export {

diff --git a/packages/main/bundle.esm.js b/packages/main/bundle.esm.js
@@ -1,7 +1,7 @@
 // ESM bundle targets Edge + browsers with native support
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/browsersupport/Edge";
+import "@ui5/webcomponents-base/src/browsersupport/Edge";
 
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/shims/jquery-shim";
+import "@ui5/webcomponents-base/src/shims/jquery-shim";
 import "./src/ThemePropertiesProvider";
 
 import Gregorian from "@ui5/webcomponents-core/dist/sap/ui/core/date/Gregorian";
@@ -50,15 +50,15 @@ import CustomListItem from "./dist/CustomListItem";
 import GroupHeaderListItem from "./dist/GroupHeaderListItem";
 
 // used in test pages
-import RenderScheduler from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/RenderScheduler";
+import RenderScheduler from "@ui5/webcomponents-base/src/RenderScheduler";
 window.RenderScheduler = RenderScheduler;
 import { isIE } from "@ui5/webcomponents-core/dist/sap/ui/Device";
 window.isIE = isIE; // attached to the window object for testing purposes
 
 
 // Note: keep in sync with rollup.config value for IIFE
-import * as configuration from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
-import * as Theming from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Theming";
+import * as configuration from "@ui5/webcomponents-base/src/Configuration";
+import * as Theming from "@ui5/webcomponents-base/src/Theming";
 window["sap-ui-webcomponents-main-bundle"] = {
 	configuration,
 	Theming,

diff --git a/packages/main/lib/hbs2ui5/RenderTemplates/LitRenderer.js b/packages/main/lib/hbs2ui5/RenderTemplates/LitRenderer.js
@@ -1,8 +1,8 @@
 const buildRenderer = (controlName, litTemplate) => {
 	return `
 /* eslint no-unused-vars: 0 */	
-import ifTruthy from '@ui5/webcomponents-base/src/sap/ui/webcomponents/base/renderer/ifTruthy';
-import { html, svg, repeat } from '@ui5/webcomponents-base/src/sap/ui/webcomponents/base/renderer/LitRenderer';
+import ifTruthy from '@ui5/webcomponents-base/src/renderer/ifTruthy';
+import { html, svg, repeat } from '@ui5/webcomponents-base/src/renderer/LitRenderer';
 const ${controlName}LitRenderer = {};
 ${litTemplate}
 ${controlName}LitRenderer.render = renderMe;

diff --git a/packages/main/rollup.config.js b/packages/main/rollup.config.js
@@ -32,7 +32,7 @@ function ui5DevImportCheckerPlugin() {
 			}
 
 			if (/import.*"@ui5\/webcomponents-core\/dist\/sap\/ui\/core\/IconPool/.test(code)) {
-				throw new Error(`You need to import '@ui5/webcomponents-base/src/sap/ui/webcomponents/base/IconPool' instead of IconPool ${file}`);
+				throw new Error(`You need to import '@ui5/webcomponents-base/src/IconPool' instead of IconPool ${file}`);
 			}
 		}
 	};

diff --git a/packages/main/src/Button.js b/packages/main/src/Button.js
@@ -1,10 +1,10 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import URI from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/URI";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import URI from "@ui5/webcomponents-base/src/types/URI";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
 import KeyCodes from "@ui5/webcomponents-core/dist/sap/ui/events/KeyCodes";
 
-// import { addCustomCSS } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/theming/CustomStyle";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+// import { addCustomCSS } from "@ui5/webcomponents-base/src/theming/CustomStyle";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 
 import ButtonTemplateContext from "./ButtonTemplateContext";
 import ButtonType from "./types/ButtonType";

diff --git a/packages/main/src/Calendar.js b/packages/main/src/Calendar.js
@@ -1,17 +1,17 @@
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/shims/jquery-shim";
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/shims/Core-shim";
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import { fetchCldrData } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/CLDR";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import { getLocale } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/LocaleProvider";
-import { getCalendarType } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
-import { getFormatLocale } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/FormatSettings";
+import "@ui5/webcomponents-base/src/shims/jquery-shim";
+import "@ui5/webcomponents-base/src/shims/Core-shim";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import { fetchCldrData } from "@ui5/webcomponents-base/src/CLDR";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import { getLocale } from "@ui5/webcomponents-base/src/LocaleProvider";
+import { getCalendarType } from "@ui5/webcomponents-base/src/Configuration";
+import { getFormatLocale } from "@ui5/webcomponents-base/src/FormatSettings";
 import DateFormat from "@ui5/webcomponents-core/dist/sap/ui/core/format/DateFormat";
 import LocaleData from "@ui5/webcomponents-core/dist/sap/ui/core/LocaleData";
-import CalendarDate from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarDate";
-import CalendarType from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarType";
-import Integer from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/Integer";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import CalendarDate from "@ui5/webcomponents-base/src/dates/CalendarDate";
+import CalendarType from "@ui5/webcomponents-base/src/dates/CalendarType";
+import Integer from "@ui5/webcomponents-base/src/types/Integer";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import CalendarTemplateContext from "./CalendarTemplateContext";
 import CalendarHeader from "./CalendarHeader";
 import DayPicker from "./DayPicker";

diff --git a/packages/main/src/CalendarHeader.js b/packages/main/src/CalendarHeader.js
@@ -1,7 +1,7 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
 import KeyCodes from "@ui5/webcomponents-core/dist/sap/ui/events/KeyCodes";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import CalendarHeaderTemplateContext from "./CalendarHeaderTemplateContext";
 import Button from "./Button";
 import ButtonType from "./types/ButtonType";

diff --git a/packages/main/src/CalendarTemplateContext.js b/packages/main/src/CalendarTemplateContext.js
@@ -1,4 +1,4 @@
-import CalendarType from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarType";
+import CalendarType from "@ui5/webcomponents-base/src/dates/CalendarType";
 
 class CalendarTemplateContext {
 	static calculate(state) {

diff --git a/packages/main/src/Card.js b/packages/main/src/Card.js
@@ -1,8 +1,8 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import URI from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/URI";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
-import { isIconURI } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/IconPool";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import URI from "@ui5/webcomponents-base/src/types/URI";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
+import { isIconURI } from "@ui5/webcomponents-base/src/IconPool";
 import CardRenderer from "./build/compiled/CardRenderer.lit";
 import Icon from "./Icon";
 

diff --git a/packages/main/src/CheckBox.js b/packages/main/src/CheckBox.js
@@ -1,10 +1,10 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
 import KeyCodes from "@ui5/webcomponents-core/dist/sap/ui/events/KeyCodes";
-import ValueState from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/ValueState";
+import ValueState from "@ui5/webcomponents-base/src/types/ValueState";
 
 // Template
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import CheckBoxRenderer from "./build/compiled/CheckBoxRenderer.lit";
 import CheckBoxTemplateContext from "./CheckBoxTemplateContext";
 import Label from "./Label";

diff --git a/packages/main/src/CustomListItem.js b/packages/main/src/CustomListItem.js
@@ -1,5 +1,5 @@
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import ListItem from "./ListItem";
 import CustomListItemTemplateContext from "./CustomListItemTemplateContext";
 import CustomListItemRenderer from "./build/compiled/CustomListItemRenderer.lit";

diff --git a/packages/main/src/DatePicker.js b/packages/main/src/DatePicker.js
@@ -1,18 +1,18 @@
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/shims/jquery-shim";
-import "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/shims/Core-shim";
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import { fetchCldrData } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/CLDR";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
+import "@ui5/webcomponents-base/src/shims/jquery-shim";
+import "@ui5/webcomponents-base/src/shims/Core-shim";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import { fetchCldrData } from "@ui5/webcomponents-base/src/CLDR";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
 import KeyCodes from "@ui5/webcomponents-core/dist/sap/ui/events/KeyCodes";
-import { getCalendarType } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
-import { getLocale } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/LocaleProvider";
-import { getIconURI } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/IconPool";
+import { getCalendarType } from "@ui5/webcomponents-base/src/Configuration";
+import { getLocale } from "@ui5/webcomponents-base/src/LocaleProvider";
+import { getIconURI } from "@ui5/webcomponents-base/src/IconPool";
 import LocaleData from "@ui5/webcomponents-core/dist/sap/ui/core/LocaleData";
 import DateFormat from "@ui5/webcomponents-core/dist/sap/ui/core/format/DateFormat";
-import CalendarType from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarType";
-import CalendarDate from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarDate";
-import ValueState from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/ValueState";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import CalendarType from "@ui5/webcomponents-base/src/dates/CalendarType";
+import CalendarDate from "@ui5/webcomponents-base/src/dates/CalendarDate";
+import ValueState from "@ui5/webcomponents-base/src/types/ValueState";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import DatePickerTemplateContext from "./DatePickerTemplateContext";
 import Icon from "./Icon";
 import Popover from "./Popover";

diff --git a/packages/main/src/DayPicker.js b/packages/main/src/DayPicker.js
@@ -1,16 +1,16 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import { getLocale } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/LocaleProvider";
-import { getCalendarType } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
-import { getFormatLocale } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/FormatSettings";
-import ItemNavigation from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/delegate/ItemNavigation";
-import { isSpace, isEnter } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/events/PseudoEvents";
-import Integer from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/Integer";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import { getLocale } from "@ui5/webcomponents-base/src/LocaleProvider";
+import { getCalendarType } from "@ui5/webcomponents-base/src/Configuration";
+import { getFormatLocale } from "@ui5/webcomponents-base/src/FormatSettings";
+import ItemNavigation from "@ui5/webcomponents-base/src/delegate/ItemNavigation";
+import { isSpace, isEnter } from "@ui5/webcomponents-base/src/events/PseudoEvents";
+import Integer from "@ui5/webcomponents-base/src/types/Integer";
 import LocaleData from "@ui5/webcomponents-core/dist/sap/ui/core/LocaleData";
-import CalendarDate from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarDate";
-import { calculateWeekNumber } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarUtils";
-import CalendarType from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/dates/CalendarType";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import CalendarDate from "@ui5/webcomponents-base/src/dates/CalendarDate";
+import { calculateWeekNumber } from "@ui5/webcomponents-base/src/dates/CalendarUtils";
+import CalendarType from "@ui5/webcomponents-base/src/dates/CalendarType";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import DayPickerTemplateContext from "./DayPickerTemplateContext";
 import DayPickerRenderer from "./build/compiled/DayPickerRenderer.lit";
 

diff --git a/packages/main/src/Dialog.js b/packages/main/src/Dialog.js
@@ -1,5 +1,5 @@
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import DialogTemplateContext from "./DialogTemplateContext";
 import Popup from "./Popup";
 // Template

diff --git a/packages/main/src/GroupHeaderListItem.js b/packages/main/src/GroupHeaderListItem.js
@@ -1,5 +1,5 @@
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import ListItemBase from "./ListItemBase";
 // Template
 import GroupHeaderListItemRenderer from "./build/compiled/GroupHeaderListItemRenderer.lit";

diff --git a/packages/main/src/Icon.js b/packages/main/src/Icon.js
@@ -1,8 +1,8 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import URI from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/URI";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
-import { isSpace, isEnter } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/events/PseudoEvents";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import URI from "@ui5/webcomponents-base/src/types/URI";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
+import { isSpace, isEnter } from "@ui5/webcomponents-base/src/events/PseudoEvents";
 import IconTemplateContext from "./IconTemplateContext";
 import IconRenderer from "./build/compiled/IconRenderer.lit";
 

diff --git a/packages/main/src/IconTemplateContext.js b/packages/main/src/IconTemplateContext.js
@@ -1,5 +1,5 @@
-import { getIconInfo } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/IconPool";
-import { getRTL } from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Configuration";
+import { getIconInfo } from "@ui5/webcomponents-base/src/IconPool";
+import { getRTL } from "@ui5/webcomponents-base/src/Configuration";
 
 const dir = getRTL() ? "rtl" : "ltr";
 

diff --git a/packages/main/src/Input.js b/packages/main/src/Input.js
@@ -1,16 +1,16 @@
-import WebComponent from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/WebComponent";
-import Bootstrap from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/Bootstrap";
+import WebComponent from "@ui5/webcomponents-base/src/WebComponent";
+import Bootstrap from "@ui5/webcomponents-base/src/Bootstrap";
 import { isIE } from "@ui5/webcomponents-core/dist/sap/ui/Device";
-import ValueState from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/types/ValueState";
-import ShadowDOM from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/compatibility/ShadowDOM";
+import ValueState from "@ui5/webcomponents-base/src/types/ValueState";
+import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
 import {
 	isUp,
 	isDown,
 	isLeft,
 	isSpace,
 	isEnter,
 	isRight,
-} from "@ui5/webcomponents-base/src/sap/ui/webcomponents/base/events/PseudoEvents";
+} from "@ui5/webcomponents-base/src/events/PseudoEvents";
 import Icon from "./Icon";
 import InputType from "./types/InputType";
 // Template
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ function ui5DevImportCheckerPlugin() { @@
     			}
     			if (/import.*"@ui5\/webcomponents-core\/dist\/sap\/ui\/core\/IconPool/.test(code)) {
-    				throw new Error(`You need to import '@ui5/webcomponents-base/src/sap/ui/webcomponents/base/IconPool' instead of IconPool ${file}`);
+    				throw new Error(`You need to import '@ui5/webcomponents-base/src/IconPool' instead of IconPool ${file}`);
     			}
     		}
     	};
@@ Expand Down @@