Skip to content

Commit

Permalink
refactor(icons): flatten dist directory (#2425)
Browse files Browse the repository at this point in the history
Change the distribution path of all individual `icons`, which changes all icons' public imports, by bringing the icons modules one level up and removing the additional "icons" folder:
```js
import "@ui5/webcomponents-icons/dist/accept.js";
```

BREAKING_CHANGE: All icons imports are changed. The individual icons modules are available in the icon package's "dist" folder. If you previously had `import "@ui5/webcomponents-icons/dist/icons/accept.js"`, now it becomes `import "@ui5/webcomponents-icons/dist/accept.js";`
ilhan007 authored Nov 2, 2020

Verified

This commit was signed with the committer’s verified signature.
aymanbagabas Ayman Bagabas
1 parent bdec517 commit c84bc8b
Showing 37 changed files with 82 additions and 83 deletions.
2 changes: 1 addition & 1 deletion docs/Assets.md
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ package are also imported since the `fiori` package internally uses features of

Normally applications are expected to import only the individual icons that are going to be used, for example:

`import "@ui5/webcomponents-icons/dist/icons/add.js`";`
`import "@ui5/webcomponents-icons/dist/add.js`";`

However, sometimes it makes sense to import all icons, hence the `import "@ui5/webcomponents-fiori/dist/Assets.js";` JSON import.
Along with the icons, it also includes all translatable texts.
8 changes: 4 additions & 4 deletions docs/Public Module Imports.md
Original file line number Diff line number Diff line change
@@ -180,10 +180,10 @@ just the ones that your app will actually use.

| Icon asset | Module import |
| ------------------------ | ---------------------------------------------------------- |
| Accelerated icon | `import "@ui5/webcomponents-icons/dist/icons/accelerated.js";` |
| Accept icon | `import "@ui5/webcomponents-icons/dist/icons/accept.js";` |
| ... | ... |
| Zoom out icon | `import "@ui5/webcomponents-icons/dist/icons/zoom-out.js";` |
| Accelerated icon | `import "@ui5/webcomponents-icons/dist/accelerated.js";` |
| Accept icon | `import "@ui5/webcomponents-icons/dist/accept.js";` |
| ... | ... |
| Zoom out icon | `import "@ui5/webcomponents-icons/dist/zoom-out.js";` |

For a complete list of the icons in the `SAP-icons` collection, click [here](https://openui5.hana.ondemand.com/test-resources/sap/m/demokit/iconExplorer/webapp/index.html#/overview/SAP-icons).

4 changes: 2 additions & 2 deletions packages/fiori/src/FlexibleColumnLayout.js
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ import AnimationMode from "@ui5/webcomponents-base/dist/types/AnimationMode.js";
import { getAnimationMode } from "@ui5/webcomponents-base/dist/config/AnimationMode.js";
import { isIE } from "@ui5/webcomponents-base/dist/Device.js";
import Button from "@ui5/webcomponents/dist/Button.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-right.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-right.js";
import FCLLayout from "./types/FCLLayout.js";
import {
getLayoutsByMedia,
10 changes: 5 additions & 5 deletions packages/fiori/src/NotificationListItemBase.js
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@ import ListItemBase from "@ui5/webcomponents/dist/ListItemBase.js";
import Priority from "@ui5/webcomponents/dist/types/Priority.js";

// Icons
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/icons/message-success.js";
import "@ui5/webcomponents-icons/dist/icons/message-error.js";
import "@ui5/webcomponents-icons/dist/icons/message-warning.js";
import "@ui5/webcomponents-icons/dist/icons/overflow.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import "@ui5/webcomponents-icons/dist/message-success.js";
import "@ui5/webcomponents-icons/dist/message-error.js";
import "@ui5/webcomponents-icons/dist/message-warning.js";
import "@ui5/webcomponents-icons/dist/overflow.js";

// Templates
import NotifactionOverflowActionsPopoverTemplate from "./generated/templates/NotifactionOverflowActionsPopoverTemplate.lit.js";
8 changes: 4 additions & 4 deletions packages/fiori/src/ShellBar.js
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ import List from "@ui5/webcomponents/dist/List.js";
import Popover from "@ui5/webcomponents/dist/Popover.js";
import Button from "@ui5/webcomponents/dist/Button.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/search.js";
import "@ui5/webcomponents-icons/dist/icons/bell.js";
import "@ui5/webcomponents-icons/dist/icons/overflow.js";
import "@ui5/webcomponents-icons/dist/icons/grid.js";
import "@ui5/webcomponents-icons/dist/search.js";
import "@ui5/webcomponents-icons/dist/bell.js";
import "@ui5/webcomponents-icons/dist/overflow.js";
import "@ui5/webcomponents-icons/dist/grid.js";

import {
SHELLBAR_LABEL,
4 changes: 2 additions & 2 deletions packages/fiori/src/UploadCollection.js
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import Label from "@ui5/webcomponents/dist/Label.js";
import List from "@ui5/webcomponents/dist/List.js";
import ListMode from "@ui5/webcomponents/dist/types/ListMode.js";
import Title from "@ui5/webcomponents/dist/Title.js";
import "@ui5/webcomponents-icons/dist/icons/upload-to-cloud.js";
import "@ui5/webcomponents-icons/dist/icons/document.js";
import "@ui5/webcomponents-icons/dist/upload-to-cloud.js";
import "@ui5/webcomponents-icons/dist/document.js";
import {
UPLOADCOLLECTION_NO_DATA_TEXT,
UPLOADCOLLECTION_NO_DATA_DESCRIPTION,
6 changes: 3 additions & 3 deletions packages/fiori/src/UploadCollectionItem.js
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ import getFileExtension from "@ui5/webcomponents-base/dist/util/getFileExtension
import RenderScheduler from "@ui5/webcomponents-base/dist/RenderScheduler.js";
import { isEnter, isEscape, isSpace } from "@ui5/webcomponents-base/dist/Keys.js";
import UploadState from "./types/UploadState.js";
import "@ui5/webcomponents-icons/dist/icons/refresh.js";
import "@ui5/webcomponents-icons/dist/icons/stop.js";
import "@ui5/webcomponents-icons/dist/icons/edit.js";
import "@ui5/webcomponents-icons/dist/refresh.js";
import "@ui5/webcomponents-icons/dist/stop.js";
import "@ui5/webcomponents-icons/dist/edit.js";
import {
UPLOADCOLLECTIONITEM_CANCELBUTTON_TEXT,
UPLOADCOLLECTIONITEM_RENAMEBUTTON_TEXT,
6 changes: 3 additions & 3 deletions packages/icons/README.md
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ Provides assets for the rich `SAP-icons` icon collection.
| Icon asset | Module import |
| ------------------------ | ---------------------------------------------------------- |
| All icons (~115KB zipped) | `import "@ui5/webcomponents-icons/dist/Assets.js";` |
| Accelerated icon | `import "@ui5/webcomponents-icons/dist/icons/accelerated.js";` |
| Accept icon | `import "@ui5/webcomponents-icons/dist/icons/accept.js";` |
| Accelerated icon | `import "@ui5/webcomponents-icons/dist/accelerated.js";` |
| Accept icon | `import "@ui5/webcomponents-icons/dist/accept.js";` |
| ... | ... |
| Zoom out icon | `import "@ui5/webcomponents-icons/dist/icons/zoom-out.js";` |
| Zoom out icon | `import "@ui5/webcomponents-icons/dist/zoom-out.js";` |

*Note:* The `@ui5/webcomponents-icons` package does not provide any web components per se, but rather icon assets,
usable by other web components such as `ui5-icon`. You could import all icons, but it's recommended to import
6 changes: 5 additions & 1 deletion packages/icons/package-scripts.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
const getScripts = require("@ui5/webcomponents-tools/icons-collection/nps.js");

const scripts = getScripts();
const options = {
collectionName: "SAP-icons",
};

const scripts = getScripts(options);

module.exports = {
scripts
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/icons/src/json-imports/Icons.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { registerIconBundle } from "@ui5/webcomponents-base/dist/asset-registries/Icons.js";

import SAPIcons from "../generated/assets/icon-collections/SAP-icons.json";
import SAPIcons from "../generated/assets/SAP-icons.json";

registerIconBundle("SAP-icons", SAPIcons);
2 changes: 1 addition & 1 deletion packages/main/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -440,7 +440,7 @@ Before:

After:
```js
@ui5/webcomponents-icons/dist/icons/add.js
@ui5/webcomponents-icons/dist/add.js
```
* **ui5-shellbar:** move component to new `@ui5/webcomponents-fiori` package ([#887](https://github.com/SAP/ui5-webcomponents/pull/887)) ([06f1770](https://github.com/SAP/ui5-webcomponents/commit/17c25ff123436c1f6e11513055b33977b06f1770))

2 changes: 1 addition & 1 deletion packages/main/src/Avatar.js
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ const metadata = {
* <br>
* <b>Note:</b> You should import the desired icon first, then use its name as "icon".
* <br><br>
* import "@ui5/webcomponents-icons/dist/icons/{icon_name}.js"
* import "@ui5/webcomponents-icons/dist/{icon_name}.js"
* <br>
* <pre>&lt;ui5-avatar icon-src="employee"></pre>
*
4 changes: 2 additions & 2 deletions packages/main/src/CalendarHeader.js
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-right.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-right.js";
import Button from "./Button.js";
import Icon from "./Icon.js";
import ButtonDesign from "./types/ButtonDesign.js";
4 changes: 2 additions & 2 deletions packages/main/src/Carousel.js
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ import {
} from "./generated/i18n/i18n-defaults.js";
import CarouselArrowsPlacement from "./types/CarouselArrowsPlacement.js";
import CarouselTemplate from "./generated/templates/CarouselTemplate.lit.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-right.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-right.js";

import Button from "./Button.js";
import Label from "./Label.js";
2 changes: 1 addition & 1 deletion packages/main/src/CheckBox.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/Ari
import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
import { getFeature } from "@ui5/webcomponents-base/dist/FeaturesRegistry.js";
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
import "@ui5/webcomponents-icons/dist/icons/accept.js";
import "@ui5/webcomponents-icons/dist/accept.js";
import Icon from "./Icon.js";
import Label from "./Label.js";
import { VALUE_STATE_ERROR, VALUE_STATE_WARNING } from "./generated/i18n/i18n-defaults.js";
4 changes: 2 additions & 2 deletions packages/main/src/ComboBox.js
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
import { isPhone } from "@ui5/webcomponents-base/dist/Device.js";
import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import {
isBackSpace,
4 changes: 2 additions & 2 deletions packages/main/src/DatePicker.js
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ import {
} from "@ui5/webcomponents-base/dist/Keys.js";
import { isPhone, isIE } from "@ui5/webcomponents-base/dist/Device.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/appointment-2.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/appointment-2.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import { DATEPICKER_OPEN_ICON_TITLE, DATEPICKER_DATE_ACC_TEXT, INPUT_SUGGESTIONS_TITLE } from "./generated/i18n/i18n-defaults.js";
import Icon from "./Icon.js";
import Button from "./Button.js";
2 changes: 1 addition & 1 deletion packages/main/src/DateTimePicker.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.j
import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
import LocaleData from "@ui5/webcomponents-localization/dist/LocaleData.js";
import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDate.js";
import "@ui5/webcomponents-icons/dist/icons/date-time.js";
import "@ui5/webcomponents-icons/dist/date-time.js";
import {
isLeft,
isRight,
2 changes: 1 addition & 1 deletion packages/main/src/Dialog.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isPhone, isDesktop } from "@ui5/webcomponents-base/dist/Device.js";
import Popup from "./Popup.js";
import "@ui5/webcomponents-icons/dist/icons/resize-corner.js";
import "@ui5/webcomponents-icons/dist/resize-corner.js";
import Icon from "./Icon.js";

// Template
2 changes: 1 addition & 1 deletion packages/main/src/DurationPicker.js
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import ResponsivePopover from "./ResponsivePopover.js";
import Input from "./Input.js";
import Icon from "./Icon.js";
import Button from "./Button.js";
import "@ui5/webcomponents-icons/dist/icons/fob-watch.js";
import "@ui5/webcomponents-icons/dist/fob-watch.js";
import DurationPickerPopoverTemplate from "./generated/templates/DurationPickerPopoverTemplate.lit.js";
import {
TIMEPICKER_HOURS_LABEL,
2 changes: 1 addition & 1 deletion packages/main/src/Icon.js
Original file line number Diff line number Diff line change
@@ -250,7 +250,7 @@ class Icon extends UI5Element {
if (iconData === ICON_NOT_FOUND) {
this.invalid = true;
/* eslint-disable-next-line */
return console.warn(`Required icon is not registered. You can either import the icon as a module in order to use it e.g. "@ui5/webcomponents-icons/dist/icons/${name.replace("sap-icon://", "")}.js", or setup a JSON build step and import "@ui5/webcomponents-icons/dist/Assets.js".`);
return console.warn(`Required icon is not registered. You can either import the icon as a module in order to use it e.g. "@ui5/webcomponents-icons/dist/${name.replace("sap-icon://", "")}.js", or setup a JSON build step and import "@ui5/webcomponents-icons/dist/Assets.js".`);
}

if (!iconData) {
2 changes: 1 addition & 1 deletion packages/main/src/Input.js
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ import {
import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import InputType from "./types/InputType.js";
import Popover from "./Popover.js";
// Templates
4 changes: 2 additions & 2 deletions packages/main/src/ListItem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/icons/edit.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import "@ui5/webcomponents-icons/dist/edit.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import ListItemType from "./types/ListItemType.js";
import ListMode from "./types/ListMode.js";
10 changes: 5 additions & 5 deletions packages/main/src/MessageStrip.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/icons/message-information.js";
import "@ui5/webcomponents-icons/dist/icons/message-success.js";
import "@ui5/webcomponents-icons/dist/icons/message-error.js";
import "@ui5/webcomponents-icons/dist/icons/message-warning.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import "@ui5/webcomponents-icons/dist/message-information.js";
import "@ui5/webcomponents-icons/dist/message-success.js";
import "@ui5/webcomponents-icons/dist/message-error.js";
import "@ui5/webcomponents-icons/dist/message-warning.js";
import MessageStripType from "./types/MessageStripType.js";
import MessageStripTemplate from "./generated/templates/MessageStripTemplate.lit.js";
import Icon from "./Icon.js";
6 changes: 3 additions & 3 deletions packages/main/src/MultiComboBox.js
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ import {
isRight,
} from "@ui5/webcomponents-base/dist/Keys.js";
import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-down.js";
import { isIE, isPhone } from "@ui5/webcomponents-base/dist/Device.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/icons/multiselect-all.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import "@ui5/webcomponents-icons/dist/multiselect-all.js";
import MultiComboBoxItem from "./MultiComboBoxItem.js";
import Tokenizer from "./Tokenizer.js";
import Token from "./Token.js";
2 changes: 1 addition & 1 deletion packages/main/src/Panel.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import {
} from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
import { getAnimationMode } from "@ui5/webcomponents-base/dist/config/AnimationMode.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-right.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-right.js";
import findNodeOwner from "@ui5/webcomponents-base/dist/util/findNodeOwner.js";
import Button from "./Button.js";
import TitleLevel from "./types/TitleLevel.js";
2 changes: 1 addition & 1 deletion packages/main/src/ResponsivePopover.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import Popover from "./Popover.js";
import Dialog from "./Dialog.js";
import Button from "./Button.js";
import Title from "./Title.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/decline.js";

// Styles
import ResponsivePopoverCss from "./generated/themes/ResponsivePopover.css.js";
4 changes: 2 additions & 2 deletions packages/main/src/Select.js
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@ import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import { getFeature } from "@ui5/webcomponents-base/dist/FeaturesRegistry.js";
import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-down.js";
import { isPhone } from "@ui5/webcomponents-base/dist/Device.js";
import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import {
VALUE_STATE_SUCCESS,
VALUE_STATE_INFORMATION,
4 changes: 2 additions & 2 deletions packages/main/src/Switch.js
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@ import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
import { isDesktop } from "@ui5/webcomponents-base/dist/Device.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/accept.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/accept.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import Icon from "./Icon.js";

import {
8 changes: 4 additions & 4 deletions packages/main/src/TabContainer.js
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ import { getAnimationMode } from "@ui5/webcomponents-base/dist/config/AnimationM
import ItemNavigation from "@ui5/webcomponents-base/dist/delegate/ItemNavigation.js";
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-up.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/icons/slim-arrow-right.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-up.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-down.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-left.js";
import "@ui5/webcomponents-icons/dist/slim-arrow-right.js";
import { TABCONTAINER_PREVIOUS_ICON_ACC_NAME, TABCONTAINER_NEXT_ICON_ACC_NAME, TABCONTAINER_OVERFLOW_MENU_TITLE } from "./generated/i18n/i18n-defaults.js";
import Button from "./Button.js";
import Icon from "./Icon.js";
2 changes: 1 addition & 1 deletion packages/main/src/TimePicker.js
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import {
isPageUpShiftCtrl,
isPageDownShiftCtrl,
} from "@ui5/webcomponents-base/dist/Keys.js";
import "@ui5/webcomponents-icons/dist/icons/time-entry-request.js";
import "@ui5/webcomponents-icons/dist/time-entry-request.js";
import Icon from "./Icon.js";
import PopoverHorizontalAlign from "./types/PopoverHorizontalAlign.js";
import ResponsivePopover from "./ResponsivePopover.js";
4 changes: 2 additions & 2 deletions packages/main/src/Token.js
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import {
isSpace,
isDelete,
} from "@ui5/webcomponents-base/dist/Keys.js";
import "@ui5/webcomponents-icons/dist/icons/decline.js";
import "@ui5/webcomponents-icons/dist/icons/sys-cancel.js";
import "@ui5/webcomponents-icons/dist/decline.js";
import "@ui5/webcomponents-icons/dist/sys-cancel.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import { TOKEN_ARIA_DELETABLE } from "./generated/i18n/i18n-defaults.js";

4 changes: 2 additions & 2 deletions packages/main/src/TreeListItem.js
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import { isLeft, isRight } from "@ui5/webcomponents-base/dist/Keys.js";
import ListItem from "./ListItem.js";
import Icon from "./Icon.js";
import "@ui5/webcomponents-icons/dist/icons/navigation-right-arrow.js";
import "@ui5/webcomponents-icons/dist/icons/navigation-down-arrow.js";
import "@ui5/webcomponents-icons/dist/navigation-right-arrow.js";
import "@ui5/webcomponents-icons/dist/navigation-down-arrow.js";

// Template
import TreeListItemTemplate from "./generated/templates/TreeListItemTemplate.lit.js";
4 changes: 2 additions & 2 deletions packages/main/src/WheelSlider.js
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ import {
isPageUp,
isPageDown,
} from "@ui5/webcomponents-base/dist/Keys.js";
import "@ui5/webcomponents-icons/dist/icons/navigation-up-arrow.js";
import "@ui5/webcomponents-icons/dist/icons/navigation-down-arrow.js";
import "@ui5/webcomponents-icons/dist/navigation-up-arrow.js";
import "@ui5/webcomponents-icons/dist/navigation-down-arrow.js";
import ScrollEnablement from "@ui5/webcomponents-base/dist/delegate/ScrollEnablement.js";
import WheelSliderTemplate from "./generated/templates/WheelSliderTemplate.lit.js";
import Button from "./Button.js";
8 changes: 4 additions & 4 deletions packages/tools/icons-collection/nps.js
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@ const path = require("path");

const LIB = path.join(__dirname, `../lib/`);

const getScripts = () => {
const getScripts = (options) => {

const scripts = {
clean: "rimraf dist",
copy: {
default: "nps copy.json-imports copy.icon-collections",
default: "nps copy.json-imports copy.icon-collection",
"json-imports": `node "${LIB}/copy-and-watch/index.js" "src/**/*.js" dist/`,
"icon-collections": `node "${LIB}/copy-and-watch/index.js" "src/icon-collections/**/*.json" dist/generated/assets/icon-collections/`
"icon-collection": `node "${LIB}/copy-and-watch/index.js" "src/*.json" dist/generated/assets/`
},
build: {
default: "nps clean copy build.i18n build.icons",
@@ -18,7 +18,7 @@ const getScripts = () => {
defaultsjs: `mkdirp dist/generated/i18n && node "${LIB}/i18n/defaults.js" src/i18n dist/generated/i18n`,
json: `mkdirp dist/generated/assets/i18n && node "${LIB}/i18n/toJSON.js" src/i18n dist/generated/assets/i18n`,
},
icons: `node "${LIB}/create-icons/index.js"`,
icons: `node "${LIB}/create-icons/index.js" "${options.collectionName}"`,
}
};

15 changes: 5 additions & 10 deletions packages/tools/lib/create-icons/index.js
Original file line number Diff line number Diff line change
@@ -2,8 +2,9 @@ const fs = require("fs");
const path = require("path");
const mkdirp = require("mkdirp");

const srcDir = `src/icon-collections/`;
const destDir = `dist/icons/`;
const collectionName = process.argv[2] || "SAP-icons";
const srcFile = path.normalize(`src/${collectionName}.json`);
const destDir = path.normalize("dist/");

mkdirp.sync(destDir);

@@ -18,7 +19,7 @@ registerIcon(name, { pathData, ltr});
export default { pathData };`;

const accTemplate = (name, pathData, ltr, accData) => `import { registerIcon } from "@ui5/webcomponents-base/dist/SVGIconRegistry.js";
import { ${accData.key} } from "../generated/i18n/i18n-defaults.js";
import { ${accData.key} } from "./generated/i18n/i18n-defaults.js";
const name = "${name}";
const pathData = "${pathData}";
@@ -43,12 +44,6 @@ const createIcons = (file) => {

fs.writeFileSync(path.join(destDir, `${name}.js`), content);
}

};

fs.readdirSync(srcDir).forEach(collectionFile => {
createIcons(path.join(srcDir, collectionFile));
});



createIcons(srcFile);

0 comments on commit c84bc8b

Please sign in to comment.