flovogt · RandomByte · Jul 18, 2023
diff --git a/demo/.gitignore b/demo/.gitignore
@@ -3,4 +3,5 @@ dist/
 .DS_Store
 coverage/
 .nyc_output/
-report/
+report/
+.ui5-cache/
diff --git a/demo/BaseComponent/package.json b/demo/BaseComponent/package.json
@@ -22,12 +22,12 @@
   ],
   "devDependencies": {
     "eslint": "^9.25.0",
-    "@ui5/cli": "^4.0.14",
+    "@ui5/cli": "^5.0.0-alpha.1",
     "local-web-server": "^5.4.0",
     "rimraf": "^6.0.1"
   },
   "engines": {
-    "node": "^16.18.0 || >=18.12.0",
+    "node": "^22.20.0 || >=24.0.0",
     "npm": ">= 8"
   },
   "author": "Jiawei Cao, Florian Vogt",

diff --git a/.../src/my/lib/sample/base/BaseController.js → demo/BaseComponent/src/BaseController.js b/.../src/my/lib/sample/base/BaseController.js → demo/BaseComponent/src/BaseController.js
diff --git a/...onent/src/my/lib/sample/base/Component.js → demo/BaseComponent/src/Component.js b/...onent/src/my/lib/sample/base/Component.js → demo/BaseComponent/src/Component.js
diff --git a/...nent/src/my/lib/sample/base/manifest.json → demo/BaseComponent/src/manifest.json b/...nent/src/my/lib/sample/base/manifest.json → demo/BaseComponent/src/manifest.json
@@ -2,7 +2,7 @@
     "_version": "2.0.0",
     "sap.app": {
         "id": "my.lib.sample.base",
-        "type": "library",
+        "type": "component",
         "embeds": [],
         "applicationVersion": {
             "version": "${version}"

diff --git a/demo/BaseComponent/src/my/lib/sample/base/library.js b/demo/BaseComponent/src/my/lib/sample/base/library.js
diff --git a/demo/BaseComponent/ui5.yaml b/demo/BaseComponent/ui5.yaml
@@ -1,13 +1,9 @@
-specVersion: "2.6"
+specVersion: "5.0"
 metadata:
   name: my.lib.sample.base
-type: library
+type: component
 framework:
   name: OpenUI5
   version: 1.136.9
   libraries:
     - name: sap.ui.core
-builder:
-  componentPreload:
-    namespaces:
-      - "my/lib/sample/base"
diff --git a/demo/CategoriesComponent/package.json b/demo/CategoriesComponent/package.json
@@ -28,12 +28,12 @@
   },
   "devDependencies": {
     "eslint": "^9.25.0",
-    "@ui5/cli": "^4.0.14",
+    "@ui5/cli": "^5.0.0-alpha.1",
     "local-web-server": "^5.4.0",
     "rimraf": "^6.0.1"
   },
   "engines": {
-    "node": "^16.18.0 || >=18.12.0",
+    "node": "^22.20.0 || >=24.0.0",
     "npm": ">= 8"
   },
   "author": "Jiawei Cao, Florian Vogt",

diff --git a/...src/my/lib/sample/categories/Component.js → demo/CategoriesComponent/src/Component.js b/...src/my/lib/sample/categories/Component.js → demo/CategoriesComponent/src/Component.js
diff --git a/...e/categories/controller/App.controller.js → ...omponent/src/controller/App.controller.js b/...e/categories/controller/App.controller.js → ...omponent/src/controller/App.controller.js
diff --git a/...ategories/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js b/...ategories/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js
diff --git a/.../categories/controller/List.controller.js → ...mponent/src/controller/List.controller.js b/.../categories/controller/List.controller.js → ...mponent/src/controller/List.controller.js
diff --git a/...rc/my/lib/sample/categories/css/style.css → demo/CategoriesComponent/src/css/style.css b/...rc/my/lib/sample/categories/css/style.css → demo/CategoriesComponent/src/css/style.css
diff --git a/...ib/sample/categories/i18n/i18n.properties → ...egoriesComponent/src/i18n/i18n.properties b/...ib/sample/categories/i18n/i18n.properties → ...egoriesComponent/src/i18n/i18n.properties
diff --git a/...rc/my/lib/sample/categories/manifest.json → demo/CategoriesComponent/src/manifest.json b/...rc/my/lib/sample/categories/manifest.json → demo/CategoriesComponent/src/manifest.json
diff --git a/...y/lib/sample/categories/view/App.view.xml → ...CategoriesComponent/src/view/App.view.xml b/...y/lib/sample/categories/view/App.view.xml → ...CategoriesComponent/src/view/App.view.xml
diff --git a/...ib/sample/categories/view/Detail.view.xml → ...egoriesComponent/src/view/Detail.view.xml b/...ib/sample/categories/view/Detail.view.xml → ...egoriesComponent/src/view/Detail.view.xml
diff --git a/.../lib/sample/categories/view/List.view.xml → ...ategoriesComponent/src/view/List.view.xml b/.../lib/sample/categories/view/List.view.xml → ...ategoriesComponent/src/view/List.view.xml
diff --git a/.../sample/categories/view/NotFound.view.xml → ...oriesComponent/src/view/NotFound.view.xml b/.../sample/categories/view/NotFound.view.xml → ...oriesComponent/src/view/NotFound.view.xml
diff --git a/...ib/sample/products/test/initMockServer.js → ...ategoriesComponent/test/initMockServer.js b/...ib/sample/products/test/initMockServer.js → ...ategoriesComponent/test/initMockServer.js
@@ -1,5 +1,5 @@
 sap.ui.define([
-	"../localService/mockserver",
+	"./localService/mockserver",
 	"sap/ui/core/Lib"
 ], (mockserver, Library) => {
 	"use strict";

diff --git a/...mple/categories/localService/metadata.xml → ...sComponent/test/localService/metadata.xml b/...mple/categories/localService/metadata.xml → ...sComponent/test/localService/metadata.xml
diff --git a/...ies/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json b/...ies/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json
diff --git a/...ories/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json b/...ories/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json
diff --git a/...ries/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json b/...ries/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json
diff --git a/...ple/categories/localService/mockserver.js → ...Component/test/localService/mockserver.js b/...ple/categories/localService/mockserver.js → ...Component/test/localService/mockserver.js
@@ -6,7 +6,6 @@ sap.ui.define([
 	"use strict";
 
 
-	// eslint-disable-next-line init-declarations
 	let oMockServer;
 
 	const sAppPath = "my/lib/sample/categories/",

diff --git a/...ib/sample/categories/test/mockServer.html → .../CategoriesComponent/test/mockServer.html b/...ib/sample/categories/test/mockServer.html → .../CategoriesComponent/test/mockServer.html
diff --git a/demo/CategoriesComponent/ui5.yaml b/demo/CategoriesComponent/ui5.yaml
@@ -1,15 +1,11 @@
-specVersion: "2.6"
+specVersion: "5.0"
 metadata:
   name: my.lib.sample.categories
-type: library
+type: component
 framework:
   name: OpenUI5
   version: 1.136.9
   libraries:
     - name: sap.ui.core
     - name: sap.m
     - name: themelib_sap_horizon
-builder:
-  componentPreload:
-    namespaces:
-      - "my/lib/sample/categories"
diff --git a/demo/ProductsComponent/package.json b/demo/ProductsComponent/package.json
@@ -27,12 +27,12 @@
   },
   "devDependencies": {
     "eslint": "^9.25.0",
-    "@ui5/cli": "^4.0.14",
+    "@ui5/cli": "^5.0.0-alpha.1",
     "local-web-server": "^5.4.0",
     "rimraf": "^6.0.1"
   },
   "engines": {
-    "node": "^16.18.0 || >=18.12.0",
+    "node": "^22.20.0 || >=24.0.0",
     "npm": ">= 8"
   },
   "author": "Jiawei Cao, Florian Vogt",

diff --git a/...t/src/my/lib/sample/products/Component.js → demo/ProductsComponent/src/Component.js b/...t/src/my/lib/sample/products/Component.js → demo/ProductsComponent/src/Component.js
diff --git a/...ple/products/controller/App.controller.js → ...omponent/src/controller/App.controller.js b/...ple/products/controller/App.controller.js → ...omponent/src/controller/App.controller.js
diff --git a/.../products/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js b/.../products/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js
diff --git a/...le/products/controller/List.controller.js → ...mponent/src/controller/List.controller.js b/...le/products/controller/List.controller.js → ...mponent/src/controller/List.controller.js
diff --git a/.../src/my/lib/sample/products/css/style.css → demo/ProductsComponent/src/css/style.css b/.../src/my/lib/sample/products/css/style.css → demo/ProductsComponent/src/css/style.css
diff --git a/.../lib/sample/products/i18n/i18n.properties → ...roductsComponent/src/i18n/i18n.properties b/.../lib/sample/products/i18n/i18n.properties → ...roductsComponent/src/i18n/i18n.properties
diff --git a/.../src/my/lib/sample/products/manifest.json → demo/ProductsComponent/src/manifest.json b/.../src/my/lib/sample/products/manifest.json → demo/ProductsComponent/src/manifest.json
diff --git a/.../my/lib/sample/products/view/App.view.xml → demo/ProductsComponent/src/view/App.view.xml b/.../my/lib/sample/products/view/App.view.xml → demo/ProductsComponent/src/view/App.view.xml
diff --git a/.../lib/sample/products/view/Detail.view.xml → ...roductsComponent/src/view/Detail.view.xml b/.../lib/sample/products/view/Detail.view.xml → ...roductsComponent/src/view/Detail.view.xml
diff --git a/...my/lib/sample/products/view/List.view.xml → .../ProductsComponent/src/view/List.view.xml b/...my/lib/sample/products/view/List.view.xml → .../ProductsComponent/src/view/List.view.xml
diff --git a/...ib/sample/products/view/NotFound.view.xml → ...ductsComponent/src/view/NotFound.view.xml b/...ib/sample/products/view/NotFound.view.xml → ...ductsComponent/src/view/NotFound.view.xml
diff --git a/.../sample/categories/test/initMockServer.js → .../ProductsComponent/test/initMockServer.js b/.../sample/categories/test/initMockServer.js → .../ProductsComponent/test/initMockServer.js
@@ -1,5 +1,5 @@
 sap.ui.define([
-	"../localService/mockserver",
+	"./localService/mockserver",
 	"sap/ui/core/Lib"
 ], (mockserver, Library) => {
 	"use strict";

diff --git a/...sample/products/localService/metadata.xml → ...sComponent/test/localService/metadata.xml b/...sample/products/localService/metadata.xml → ...sComponent/test/localService/metadata.xml
diff --git a/...cts/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json b/...cts/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json
diff --git a/...ducts/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json b/...ducts/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json
diff --git a/...ucts/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json b/...ucts/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json
diff --git a/...ample/products/localService/mockserver.js → ...Component/test/localService/mockserver.js b/...ample/products/localService/mockserver.js → ...Component/test/localService/mockserver.js
@@ -6,7 +6,6 @@ sap.ui.define([
 	"use strict";
 
 
-	// eslint-disable-next-line init-declarations
 	let oMockServer;
 
 	const sAppPath = "my/lib/sample/products/",

diff --git a/.../lib/sample/products/test/mockServer.html → demo/ProductsComponent/test/mockServer.html b/.../lib/sample/products/test/mockServer.html → demo/ProductsComponent/test/mockServer.html
diff --git a/demo/ProductsComponent/ui5.yaml b/demo/ProductsComponent/ui5.yaml
@@ -1,15 +1,11 @@
-specVersion: "2.6"
+specVersion: "5.0"
 metadata:
   name: my.lib.sample.products
-type: library
+type: component
 framework:
   name: OpenUI5
   version: 1.136.9
   libraries:
     - name: sap.ui.core
     - name: sap.m
     - name: themelib_sap_horizon
-builder:
-  componentPreload:
-    namespaces:
-        - "my/lib/sample/products"
diff --git a/demo/RootComponent/package.json b/demo/RootComponent/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@eslint/js": "^9.30.1",
     "eslint": "^9.30.1",
-    "@ui5/cli": "^4.0.14",
+    "@ui5/cli": "^5.0.0-alpha.1",
     "@ui5/linter": "^1.16.0",
 		"@ui5/middleware-code-coverage": "^2.0.1",
     "globals": "^16.3.0",

diff --git a/demo/RootComponent/ui5.yaml b/demo/RootComponent/ui5.yaml
@@ -1,6 +1,6 @@
-specVersion: "2.6"
+specVersion: "5.0"
 metadata:
-  name: RootComponent
+  name: root.component
 type: application
 framework:
   name: OpenUI5

diff --git a/demo/SuppliersComponent/package.json b/demo/SuppliersComponent/package.json
@@ -28,12 +28,12 @@
   },
   "devDependencies": {
     "eslint": "^9.25.0",
-    "@ui5/cli": "^4.0.14",
+    "@ui5/cli": "^5.0.0-alpha.1",
     "local-web-server": "^5.4.0",
     "rimraf": "^6.0.1"
   },
   "engines": {
-    "node": "^16.18.0 || >=18.12.0",
+    "node": "^22.20.0 || >=24.0.0",
     "npm": ">= 8"
   },
   "author": "Jiawei Cao, Florian Vogt",

diff --git a/.../src/my/lib/sample/suppliers/Component.js → demo/SuppliersComponent/src/Component.js b/.../src/my/lib/sample/suppliers/Component.js → demo/SuppliersComponent/src/Component.js
diff --git a/...le/suppliers/controller/App.controller.js → ...omponent/src/controller/App.controller.js b/...le/suppliers/controller/App.controller.js → ...omponent/src/controller/App.controller.js
diff --git a/...suppliers/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js b/...suppliers/controller/Detail.controller.js → ...onent/src/controller/Detail.controller.js
diff --git a/...e/suppliers/controller/List.controller.js → ...mponent/src/controller/List.controller.js b/...e/suppliers/controller/List.controller.js → ...mponent/src/controller/List.controller.js
diff --git a/...src/my/lib/sample/suppliers/css/style.css → demo/SuppliersComponent/src/css/style.css b/...src/my/lib/sample/suppliers/css/style.css → demo/SuppliersComponent/src/css/style.css
diff --git a/...lib/sample/suppliers/i18n/i18n.properties → ...ppliersComponent/src/i18n/i18n.properties b/...lib/sample/suppliers/i18n/i18n.properties → ...ppliersComponent/src/i18n/i18n.properties
diff --git a/...nt/src/my/lib/sample/suppliers/index.html → demo/SuppliersComponent/src/index.html b/...nt/src/my/lib/sample/suppliers/index.html → demo/SuppliersComponent/src/index.html
diff --git a/...src/my/lib/sample/suppliers/manifest.json → demo/SuppliersComponent/src/manifest.json b/...src/my/lib/sample/suppliers/manifest.json → demo/SuppliersComponent/src/manifest.json
diff --git a/...my/lib/sample/suppliers/view/App.view.xml → .../SuppliersComponent/src/view/App.view.xml b/...my/lib/sample/suppliers/view/App.view.xml → .../SuppliersComponent/src/view/App.view.xml
diff --git a/...lib/sample/suppliers/view/Detail.view.xml → ...ppliersComponent/src/view/Detail.view.xml b/...lib/sample/suppliers/view/Detail.view.xml → ...ppliersComponent/src/view/Detail.view.xml
diff --git a/...y/lib/sample/suppliers/view/List.view.xml → ...SuppliersComponent/src/view/List.view.xml b/...y/lib/sample/suppliers/view/List.view.xml → ...SuppliersComponent/src/view/List.view.xml
diff --git a/...b/sample/suppliers/view/NotFound.view.xml → ...liersComponent/src/view/NotFound.view.xml b/...b/sample/suppliers/view/NotFound.view.xml → ...liersComponent/src/view/NotFound.view.xml
diff --git a/...b/sample/suppliers/test/initMockServer.js → ...SuppliersComponent/test/initMockServer.js b/...b/sample/suppliers/test/initMockServer.js → ...SuppliersComponent/test/initMockServer.js
@@ -1,5 +1,5 @@
 sap.ui.define([
-	"../localService/mockserver",
+	"./localService/mockserver",
 	"sap/ui/core/Lib"
 ], (mockserver, Library) => {
 	"use strict";

diff --git a/...ample/suppliers/localService/metadata.xml → ...sComponent/test/localService/metadata.xml b/...ample/suppliers/localService/metadata.xml → ...sComponent/test/localService/metadata.xml
diff --git a/...ers/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json b/...ers/localService/mockdata/Categories.json → ...est/localService/mockdata/Categories.json
diff --git a/...liers/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json b/...liers/localService/mockdata/Products.json → .../test/localService/mockdata/Products.json
diff --git a/...iers/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json b/...iers/localService/mockdata/Suppliers.json → ...test/localService/mockdata/Suppliers.json
diff --git a/...mple/suppliers/localService/mockserver.js → ...Component/test/localService/mockserver.js b/...mple/suppliers/localService/mockserver.js → ...Component/test/localService/mockserver.js
@@ -6,7 +6,6 @@ sap.ui.define([
 	"use strict";
 
 
-	// eslint-disable-next-line init-declarations
 	let oMockServer;
 
 	const sAppPath = "my/lib/sample/suppliers/",

diff --git a/...lib/sample/suppliers/test/mockServer.html → demo/SuppliersComponent/test/mockServer.html b/...lib/sample/suppliers/test/mockServer.html → demo/SuppliersComponent/test/mockServer.html
diff --git a/demo/SuppliersComponent/ui5.yaml b/demo/SuppliersComponent/ui5.yaml
@@ -1,15 +1,11 @@
-specVersion: "2.6"
+specVersion: "5.0"
 metadata:
   name: my.lib.sample.suppliers
-type: library
+type: component
 framework:
   name: OpenUI5
   version: 1.136.9
   libraries:
     - name: sap.ui.core
     - name: sap.m
     - name: themelib_sap_horizon
-builder:
-  componentPreload:
-      namespaces:
-          - "my/lib/sample/suppliers"