@sap-ux/ui5-application-writer 1.6.5 → 1.6.7

package/dist/data/defaults.js

@@ -96,7 +96,7 @@ function mergeUi5(ui5, options) {
         merged.manifestLibs = (0, ui5Libs_1.getUI5Libs)(ui5.manifestLibs);
     }
     merged.ui5Libs = (0, ui5Libs_1.getUI5Libs)(ui5.ui5Libs);
-    return Object.assign({}, ui5, merged);
+    return { ...ui5, ...merged };
 }
 /**
  * Gets the miminum UI5 version based on the specified version.

package/dist/data/index.js

@@ -15,9 +15,9 @@ function mergeWithDefaults(ui5App) {
     (0, validators_1.validate)(ui5App);
     ui5App.app = (0, defaults_1.mergeApp)(ui5App.app);
     ui5App.appOptions = ui5App.appOptions || {};
-    // if typescript and codeAssist is enabled disable codeAssist
-    if (ui5App.appOptions.typescript && ui5App.appOptions.codeAssist) {
-        ui5App.appOptions.codeAssist = false;
+    // if typescript is enabled then enable eslint too
+    if (ui5App.appOptions.typescript) {
+        ui5App.appOptions.eslint = true;
     }
     ui5App.ui5 = (0, defaults_1.mergeUi5)(ui5App.ui5 || {}, ui5App.appOptions);
     // Determine if the project type is 'EDMXBackend'.

package/dist/options.js

@@ -49,7 +49,6 @@ async function copyTemplates(name, { ui5App, fs, basePath, tmplPath }) {
  * Factory functions for applying optional features.
  */
 const factories = {
-    codeAssist: async (input) => await copyTemplates('codeAssist', input),
     eslint: async (input) => await copyTemplates('eslint', input),
     loadReuseLibs: async (input) => await copyTemplates('loadReuseLibs', input),
     sapux: async (input) => {

package/dist/types.d.ts

@@ -131,6 +131,11 @@ export interface UI5 {
     customUi5Libs?: string[];
 }
 export interface AppOptions {
+    /**
+     * @deprecated
+     * Enables code assist
+     * No longer supported. Will be removed from the interface in future releases.
+     */
     codeAssist: boolean;
     eslint: boolean;
     sapux: boolean;

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aui5-application-writer"
   },
-  "version": "1.6.5",
+  "version": "1.6.7",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,7 +27,7 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "semver": "7.5.4",
-    "@sap-ux/ui5-config": "0.29.11"
+    "@sap-ux/ui5-config": "0.29.12"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -37,8 +37,8 @@
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
-    "@sap-ux/eslint-plugin-fiori-tools": "0.6.2",
-    "@sap-ux/project-access": "1.32.16"
+    "@sap-ux/eslint-plugin-fiori-tools": "9.0.2",
+    "@sap-ux/project-access": "1.33.0"
   },
   "engines": {
     "node": ">=20.x"

package/templates/optional/eslint/eslint.config.js

@@ -0,0 +1,6 @@
+const { defineConfig } = require('eslint/config');
+const fioriTools  = require('@sap-ux/eslint-plugin-fiori-tools');
+
+module.exports = defineConfig([
+    ...fioriTools.configs.recommended
+]);

package/templates/optional/eslint/package.json

@@ -3,9 +3,7 @@
         "lint": "eslint ./"
     },
     "devDependencies": {
-        "@sap-ux/eslint-plugin-fiori-tools": "^0.4.0",
-        "eslint": "8.57.0",
-        "eslint-plugin-fiori-custom": "2.6.7",
-        "@babel/eslint-parser": "7.14.7"
+        "@sap-ux/eslint-plugin-fiori-tools": "^9.0.0",
+        "eslint": "^9"
     }
 }

package/templates/optional/loadReuseLibs/1.120.0/webapp/test/locate-reuse-libs.js

@@ -170,7 +170,6 @@
         });
     };
     
-    /*eslint-disable fiori-custom/sap-browser-api-warning, fiori-custom/sap-no-dom-access*/
     var currentScript = document.getElementById("locate-reuse-libs");
     if (!currentScript) {
         currentScript = document.currentScript;

package/templates/optional/loadReuseLibs/1.71.0/webapp/test/locate-reuse-libs.js

@@ -167,7 +167,6 @@ function registerSAPFonts() {
     });
 };
 
-/*eslint-disable fiori-custom/sap-browser-api-warning, fiori-custom/sap-no-dom-access*/
 var currentScript = document.getElementById("locate-reuse-libs");
 if (!currentScript) {
     currentScript = document.currentScript;

package/templates/optional/typescript/package.json

@@ -7,10 +7,7 @@
     },
     "devDependencies": {
         "<%- ui5.typesPackage %>": "<%- ui5.typesVersion %>",
-        "ui5-tooling-transpile": "^3.3.7",
-        "typescript": "^5.1.6",
-        "@typescript-eslint/eslint-plugin": "^7.1.1",
-        "@typescript-eslint/parser": "^7.1.1",
-        "@sap-ux/eslint-plugin-fiori-tools": "^0.4.0"
+        "ui5-tooling-transpile": "^3.10.0",
+        "typescript": "^5.9.3"
     }
 }

package/templates/optional/codeAssist/.eslintrc

@@ -1,10 +0,0 @@
-{
-    "root": true,
-    "plugins": [
-        "@sap/ui5-jsdocs"
-    ],
-    "extends": [
-        "plugin:@sap/ui5-jsdocs/recommended",
-        "eslint:recommended"
-    ]
-}

package/templates/optional/codeAssist/package.json

@@ -1,7 +0,0 @@
-{
-    "devDependencies": {
-        "eslint": "8.57.0",
-        "@sap/eslint-plugin-ui5-jsdocs": "2.0.5",
-        "@sapui5/ts-types": "<%- ui5.typesVersion %>"
-    }
-}

package/templates/optional/codeAssist/tsconfig.json

@@ -1,11 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "none",
-        "noEmit": true,
-        "checkJs": true,
-        "allowJs": true,
-        "types": [
-            "@sapui5/ts-types"
-        ]
-    }
-}

package/templates/optional/eslint/.eslintrc

@@ -1,4 +0,0 @@
-{
-    "extends": "plugin:@sap-ux/eslint-plugin-fiori-tools/defaultJS",
-    "root": true
-}

package/templates/optional/typescript/.eslintrc

@@ -1,4 +0,0 @@
-{
-    "extends": "plugin:@sap-ux/eslint-plugin-fiori-tools/defaultTS",
-    "root": true
-}