Skip to content

Commit 93d1a11

Browse files
committed
fix(ui5-side-navigation): await upgrade of groups in samples by changing the import order
1 parent 17081ca commit 93d1a11

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

packages/fiori/src/bundle.esm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import SearchItem from "./SearchItem.js";
3737
import SearchItemGroup from "./SearchItemGroup.js";
3838
import ShellBarSpacer from "./ShellBarSpacer.js";
3939
import ShellBarItem from "./ShellBarItem.js";
40-
import SideNavigation from "./SideNavigation.js";
4140
import SideNavigationItem from "./SideNavigationItem.js";
4241
import SideNavigationSubItem from "./SideNavigationSubItem.js";
4342
import SideNavigationGroup from "./SideNavigationGroup.js";
43+
import SideNavigation from "./SideNavigation.js";
4444
import SortItem from "./SortItem.js";
4545
import UserSettingsItem from "./UserSettingsItem.js";
4646
import SettingsDialog from "./UserSettingsDialog.js";

packages/tools/components-package/nps.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ const getScripts = (options) => {
6464
lintfix: `eslint . ${eslintConfig} --fix`,
6565
generate: {
6666
default: `${tsCrossEnv} nps prepare.all`,
67-
all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps copyProps" "nps build.illustrations"',
67+
all: 'concurrently "nps build.i18n" "nps prepare.styleRelated" "nps copyProps" "nps build.illustrations"',
6868
styleRelated: "nps build.styles build.jsonImports build.jsImports",
6969
},
7070
prepare: {
7171
default: `${tsCrossEnv} nps clean prepare.all ${options.legacy ? "copy" : ""} copyProps prepare.typescript generateAPI`,
72-
all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps build.illustrations"',
72+
all: 'concurrently "nps build.i18n" "nps prepare.styleRelated" "nps build.illustrations"',
7373
styleRelated: "nps build.styles build.jsonImports build.jsImports",
7474
typescript: tsCommandOld,
7575
},
@@ -106,7 +106,7 @@ const getScripts = (options) => {
106106
props: `node "${LIB}/copy-and-watch/index.js" --silent "src/i18n/*.properties" dist/`,
107107
},
108108
watch: {
109-
default: `${tsCrossEnv} concurrently "nps watch.templates" "nps watch.typescript" ${options.legacy ? '"nps watch.src"' : ""} "nps watch.styles" "nps watch.i18n" "nps watch.props"`,
109+
default: `${tsCrossEnv} concurrently "nps watch.typescript" ${options.legacy ? '"nps watch.src"' : ""} "nps watch.styles" "nps watch.i18n" "nps watch.props"`,
110110
devServer: 'concurrently "nps watch.default" "nps watch.bundle"',
111111
src: 'nps "copy.src --watch --safe --skip-initial-copy"',
112112
typescript: tsWatchCommandStandalone,
@@ -139,7 +139,7 @@ const getScripts = (options) => {
139139
replace: `node "${LIB}/scoping/scope-test-pages.js" test/pages/scoped demo`,
140140
},
141141
watchWithBundle: 'concurrently "nps scope.watch" "nps scope.bundle" ',
142-
watch: 'concurrently "nps watch.templates" "nps watch.props" "nps watch.styles"',
142+
watch: 'concurrently "nps watch.props" "nps watch.styles"',
143143
bundle: `node ${LIB}/dev-server/dev-server.mjs ${viteConfig}`,
144144
},
145145
generateAPI: {

packages/website/docs/_samples/fiori/SideNavigation/Basic/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
21
import "@ui5/webcomponents-fiori/dist/SideNavigationItem.js";
3-
import "@ui5/webcomponents-fiori/dist/SideNavigationGroup.js";
42
import "@ui5/webcomponents-fiori/dist/SideNavigationSubItem.js";
53
import "@ui5/webcomponents-fiori/dist/SideNavigationGroup.js";
4+
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
65

76
import "@ui5/webcomponents-icons/dist/home.js";
87
import "@ui5/webcomponents-icons/dist/chain-link.js";

packages/website/docs/_samples/fiori/SideNavigation/OverlayMode/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/* playground-hide */
22
import "./playground-support.js";
33
/* playground-hide-end */
4-
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
54
import "@ui5/webcomponents-fiori/dist/SideNavigationItem.js";
6-
import "@ui5/webcomponents-fiori/dist/SideNavigationGroup.js";
75
import "@ui5/webcomponents-fiori/dist/SideNavigationSubItem.js";
86
import "@ui5/webcomponents-fiori/dist/SideNavigationGroup.js";
7+
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
98
import "@ui5/webcomponents-fiori/dist/ShellBar.js";
109
import "@ui5/webcomponents/dist/ResponsivePopover.js"
1110
import "@ui5/webcomponents-fiori/dist/Page.js"

packages/website/docs/_samples/fiori/SideNavigation/QuickAction/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
21
import "@ui5/webcomponents-fiori/dist/SideNavigationItem.js";
32
import "@ui5/webcomponents-fiori/dist/SideNavigationGroup.js";
43
import "@ui5/webcomponents-fiori/dist/SideNavigationSubItem.js";
4+
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
55

66
import "@ui5/webcomponents-icons/dist/home.js";
77
import "@ui5/webcomponents-icons/dist/group.js";

packages/website/docs/_samples/fiori/SideNavigation/UnselectableParentItems/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
21
import "@ui5/webcomponents-fiori/dist/SideNavigationItem.js";
32
import "@ui5/webcomponents-fiori/dist/SideNavigationSubItem.js";
3+
import "@ui5/webcomponents-fiori/dist/SideNavigation.js";
44

55
import "@ui5/webcomponents-icons/dist/home.js";
66
import "@ui5/webcomponents-icons/dist/group.js";

0 commit comments

Comments
 (0)