diff --git a/.prettierignore b/.prettierignore index 01eb42d..89b7ff1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,4 @@ test/*/ generators/app/templates/webapp/Component.ts generators/app/templates/webapp/model/models.ts generators/app/templates/webapp/view/*.xml +generators/app/templates/webapp/index*.html \ No newline at end of file diff --git a/generators/app/index.js b/generators/app/index.js index b13d01d..97b8c75 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -147,6 +147,7 @@ export default class extends Generator { // version parameters this.config.set("gte1_98_0", semver.gte(props.frameworkVersion, "1.98.0")); this.config.set("gte1_104_0", semver.gte(props.frameworkVersion, "1.104.0")); + this.config.set("gte1_120_0", semver.gte(props.frameworkVersion, "1.120.0")); this.config.set("lt1_124_0", semver.lt(props.frameworkVersion, "1.124.0")); }); } diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 7241592..6fc54f7 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -19,16 +19,16 @@ "test": "npm run lint && npm run karma-ci-cov" }, "devDependencies": { - "@ui5/cli": "^4.0.6", - "@ui5/middleware-code-coverage": "^2.0.0", - "eslint": "^9.9.1", - "eslint-plugin-jsdoc": "^50.2.2", - "globals": "^15.9.0", + "@ui5/cli": "^4.0.22", + "@ui5/middleware-code-coverage": "^2.0.1", + "eslint": "^9.31.0", + "eslint-plugin-jsdoc": "^51.4.1", + "globals": "^16.3.0", "karma": "^6.4.4", "karma-chrome-launcher": "^3.2.0", "karma-coverage": "^2.2.1", - "karma-ui5": "^4.0.1", + "karma-ui5": "^4.1.0", "rimraf": "^6.0.1", - "ui5-middleware-livereload": "^3.0.3" + "ui5-middleware-livereload": "^3.1.2" } } diff --git a/generators/app/templates/webapp/controller/BaseController.js b/generators/app/templates/webapp/controller/BaseController.js index 5ec517b..66d81b9 100644 --- a/generators/app/templates/webapp/controller/BaseController.js +++ b/generators/app/templates/webapp/controller/BaseController.js @@ -2,14 +2,6 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/UIComponent", "sap/ui/ "use strict"; return Controller.extend("<%= appId %>.controller.BaseController", { - /** - * Convenience method for accessing the component of the controller's view. - * @returns {sap.ui.core.Component} The component of the controller's view - */ - getOwnerComponent: function () { - return Controller.prototype.getOwnerComponent.call(this); - }, - /** * Convenience method to get the components' router instance. * @returns {sap.m.routing.Router} The router instance diff --git a/generators/app/templates/webapp/index-cdn.html b/generators/app/templates/webapp/index-cdn.html index a45582f..07bf10d 100644 --- a/generators/app/templates/webapp/index-cdn.html +++ b/generators/app/templates/webapp/index-cdn.html @@ -10,14 +10,21 @@ diff --git a/generators/app/templates/webapp/index.html b/generators/app/templates/webapp/index.html index 135c2ce..dc72b1e 100644 --- a/generators/app/templates/webapp/index.html +++ b/generators/app/templates/webapp/index.html @@ -10,14 +10,21 @@ diff --git a/generators/app/templates/webapp/test-lt1_124/unit/controller/App.qunit.js b/generators/app/templates/webapp/test-lt1_124/unit/controller/Main.qunit.js similarity index 69% rename from generators/app/templates/webapp/test-lt1_124/unit/controller/App.qunit.js rename to generators/app/templates/webapp/test-lt1_124/unit/controller/Main.qunit.js index c4c8061..8baf7ff 100644 --- a/generators/app/templates/webapp/test-lt1_124/unit/controller/App.qunit.js +++ b/generators/app/templates/webapp/test-lt1_124/unit/controller/Main.qunit.js @@ -2,9 +2,9 @@ sap.ui.define(["<%= appURI %>/controller/Main.controller"], function (MainController) { "use strict"; - QUnit.module("Sample App controller test"); + QUnit.module("Sample Main controller test"); - QUnit.test("The AppController class has a sayHello method", function (assert) { + QUnit.test("The MainController class has a sayHello method", function (assert) { // as a very basic test example just check the presence of the "sayHello" method assert.strictEqual(typeof MainController.prototype.sayHello, "function"); }); diff --git a/generators/app/templates/webapp/test-lt1_124/unit/unitTests.qunit.js b/generators/app/templates/webapp/test-lt1_124/unit/unitTests.qunit.js index 25b8d91..e9aa386 100644 --- a/generators/app/templates/webapp/test-lt1_124/unit/unitTests.qunit.js +++ b/generators/app/templates/webapp/test-lt1_124/unit/unitTests.qunit.js @@ -6,7 +6,7 @@ QUnit.config.autostart = false; sap.ui.getCore().attachInit(function () { "use strict"; - sap.ui.require(["unit/controller/App.qunit"], function () { + sap.ui.require(["unit/controller/Main.qunit"], function () { QUnit.start(); }); }); diff --git a/generators/app/templates/webapp/test/unit/controller/App.qunit.js b/generators/app/templates/webapp/test/unit/controller/Main.qunit.js similarity index 69% rename from generators/app/templates/webapp/test/unit/controller/App.qunit.js rename to generators/app/templates/webapp/test/unit/controller/Main.qunit.js index c4c8061..8baf7ff 100644 --- a/generators/app/templates/webapp/test/unit/controller/App.qunit.js +++ b/generators/app/templates/webapp/test/unit/controller/Main.qunit.js @@ -2,9 +2,9 @@ sap.ui.define(["<%= appURI %>/controller/Main.controller"], function (MainController) { "use strict"; - QUnit.module("Sample App controller test"); + QUnit.module("Sample Main controller test"); - QUnit.test("The AppController class has a sayHello method", function (assert) { + QUnit.test("The MainController class has a sayHello method", function (assert) { // as a very basic test example just check the presence of the "sayHello" method assert.strictEqual(typeof MainController.prototype.sayHello, "function"); }); diff --git a/generators/app/templates/webapp/test/unit/unitTests.qunit.js b/generators/app/templates/webapp/test/unit/unitTests.qunit.js index 9eee822..729854c 100644 --- a/generators/app/templates/webapp/test/unit/unitTests.qunit.js +++ b/generators/app/templates/webapp/test/unit/unitTests.qunit.js @@ -1 +1 @@ -sap.ui.define(["./controller/App.qunit"]); +sap.ui.define(["./controller/Main.qunit"]);