fix: resolve conflicts

.gitignore

@@ -118,6 +118,7 @@ out
 
 .nuxt
 dist
+generators
 
 # Gatsby files
 

.vscode/launch.json

@@ -33,12 +33,12 @@
  {
  "type": "node",
  "request": "launch",
- "name": "examples/prompting-ui: Run Example",
+ "name": "examples/ui-prompting-examples: Run Example",
  "runtimeExecutable": "pnpm",
  "runtimeArgs": ["storybook"],
  "console": "integratedTerminal",
  "internalConsoleOptions": "neverOpen",
- "cwd": "${workspaceFolder}/examples/prompting-ui"
+ "cwd": "${workspaceFolder}/examples/ui-prompting-examples"
  },
  {
  "type": "node",
@@ -352,6 +352,23 @@
  },
  "cwd": "${workspaceFolder}/packages/xml-odata-annotation-converter"
  },
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "adp-tooling: Debug Current Jest File",
+ "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+ "args": ["${fileBasenameNoExtension}", "--config", "jest.config.js", "--coverage=false", "--runInBand"],
+ "console": "integratedTerminal",
+ "internalConsoleOptions": "neverOpen",
+ "disableOptimisticBPs": true,
+ "windows": {
+ "program": "${workspaceFolder}/node_modules/jest/bin/jest"
+ },
+ "cwd": "${workspaceFolder}/packages/adp-tooling",
+ "env": {
+ "UX_DEBUG": "false"
+ }
+ },
  {
  "type": "node",
  "request": "launch",

docs/version-overrides.md

@@ -2,6 +2,26 @@
 
 This document lists the version overrides for vulnerable (nested) dependencies and the reason.
 
-```
+## @ui5/cli -> @ui5/server -> router
+
+- waiting on UI5 fixes to be released
+- may be necessary to upgrade to version 4 of the UI5 cli
 
 ```
+┌─────────────────────┬────────────────────────────────────────────────────────┐
+│ high │ path-to-regexp outputs backtracking regular │
+│ │ expressions │
+├─────────────────────┼────────────────────────────────────────────────────────┤
+│ Package │ path-to-regexp │
+├─────────────────────┼────────────────────────────────────────────────────────┤
+│ Vulnerable versions │ <0.1.10 │
+├─────────────────────┼────────────────────────────────────────────────────────┤
+│ Patched versions │ >=0.1.10 │
+├─────────────────────┼────────────────────────────────────────────────────────┤
+│ Paths │ packages\preview-middleware-client > @ui5/[email protected] > │
+│ │ @ui5/[email protected] > [email protected] > │
+│ │ [email protected] │
+├─────────────────────┼────────────────────────────────────────────────────────┤
+│ More info │ https://github.com/advisories/GHSA-9wv6-86v2-598j │
+└─────────────────────┴────────────────────────────────────────────────────────┘
+```

examples/README.md

@@ -10,5 +10,5 @@ A simplified example illustrating how to create a yeoman generator using the `fi
 ## fe-fpm-cli
 A simple CLI to prompt required information to create a building block using the `fe-fpm-writer` module's prompt and generate functions.
 
-## prompting-ui
+## ui-prompting-examples
 A storybook project containing playground for consuming/testing `Prompts API` from `fe-fpm-writer` and `UI` from `@sap-ux/ui-prompting`

examples/fe-fpm-cli/CHANGELOG.md

@@ -1,5 +1,68 @@
 # @sap-ux/fe-fpm-cli
 
+## 0.0.36
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.9
+
+## 0.0.35
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.8
+
+## 0.0.34
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.7
+
+## 0.0.33
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.6
+
+## 0.0.32
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.5
+
+## 0.0.31
+
+### Patch Changes
+
+- Updated dependencies [05b554d]
+ - @sap-ux/fe-fpm-writer@0.31.4
+
+## 0.0.30
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.3
+
+## 0.0.29
+
+### Patch Changes
+
+- Updated dependencies [a18d4a2]
+ - @sap-ux/fe-fpm-writer@0.31.2
+
+## 0.0.28
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.31.1
+
+## 0.0.27
+
+### Patch Changes
+
+- Updated dependencies [327ebec]
+ - @sap-ux/fe-fpm-writer@0.31.0
+
 ## 0.0.26
 
 ### Patch Changes

examples/fe-fpm-cli/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@sap-ux/fe-fpm-cli",
- "version": "0.0.26",
+ "version": "0.0.36",
  "description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
  "license": "Apache-2.0",
  "private": true,

examples/fe-fpm-cli/sample/fe-app/package.json

@@ -1 +1,3 @@
-{}
+{
+ "sapux": true
+}

examples/simple-generator/CHANGELOG.md

@@ -1,5 +1,101 @@
 # @sap-ux/generator-simple-fe
 
+## 1.0.59
+
+### Patch Changes
+
+- @sap-ux/axios-extension@1.16.6
+- @sap-ux/system-access@0.5.12
+- @sap-ux/fiori-elements-writer@1.3.7
+- @sap-ux/fiori-freestyle-writer@1.2.5
+
+## 1.0.58
+
+### Patch Changes
+
+- @sap-ux/axios-extension@1.16.6
+- @sap-ux/system-access@0.5.12
+- @sap-ux/fiori-elements-writer@1.3.6
+- @sap-ux/fiori-freestyle-writer@1.2.4
+
+## 1.0.57
+
+### Patch Changes
+
+- @sap-ux/axios-extension@1.16.6
+- @sap-ux/system-access@0.5.12
+- @sap-ux/fiori-elements-writer@1.3.5
+- @sap-ux/fiori-freestyle-writer@1.2.3
+
+## 1.0.56
+
+### Patch Changes
+
+- @sap-ux/fiori-elements-writer@1.3.4
+- @sap-ux/fiori-freestyle-writer@1.2.2
+
+## 1.0.55
+
+### Patch Changes
+
+- @sap-ux/system-access@0.5.12
+- @sap-ux/fiori-elements-writer@1.3.3
+
+## 1.0.54
+
+### Patch Changes
+
+- @sap-ux/axios-extension@1.16.6
+- @sap-ux/system-access@0.5.11
+- @sap-ux/fiori-elements-writer@1.3.2
+- @sap-ux/fiori-freestyle-writer@1.2.1
+
+## 1.0.53
+
+### Patch Changes
+
+- @sap-ux/fiori-elements-writer@1.3.1
+
+## 1.0.52
+
+### Patch Changes
+
+- Updated dependencies [04988f1]
+ - @sap-ux/fiori-freestyle-writer@1.2.0
+ - @sap-ux/fiori-elements-writer@1.3.0
+
+## 1.0.51
+
+### Patch Changes
+
+- 484195d: Enhancements to FE & FF Configurations: The updates include adding the `start-variants-management` script to `package.json` for FE and FF. The OdataService interface now has an `ignoreCertError` property. UI5 application writer introduces the `sapuxLayer` property to `package.json` templates and adds `fiori-tools-preview middleware` to ui5, ui5-mock, and ui5-local.yaml. Additionally, the `addFioriToolsPreviewMiddleware` function has been added for YAML config integration.
+- Updated dependencies [484195d]
+ - @sap-ux/fiori-freestyle-writer@1.1.0
+ - @sap-ux/fiori-elements-writer@1.2.0
+ - @sap-ux/axios-extension@1.16.6
+ - @sap-ux/system-access@0.5.11
+
+## 1.0.50
+
+### Patch Changes
+
+- @sap-ux/fiori-elements-writer@1.1.24
+
+## 1.0.49
+
+### Patch Changes
+
+- @sap-ux/axios-extension@1.16.6
+- @sap-ux/system-access@0.5.11
+- @sap-ux/fiori-elements-writer@1.1.23
+- @sap-ux/fiori-freestyle-writer@1.0.24
+
+## 1.0.48
+
+### Patch Changes
+
+- @sap-ux/fiori-elements-writer@1.1.22
+
 ## 1.0.47
 
 ### Patch Changes

examples/simple-generator/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@sap-ux/generator-simple-fe",
- "version": "1.0.47",
+ "version": "1.0.59",
  "description": "Simple example of a yeoman generator for Fiori elements.",
  "license": "Apache-2.0",
  "private": true,

examples/simple-generator/src/app/index.ts

@@ -145,7 +145,7 @@ export default class extends Generator {
  // configuring the source/template root folder to point to the folder containing the karma templates
  this.sourceRoot(join(__dirname, '..', '..', 'templates', 'karma'));
  // hard-coded output folder just for testing, in a real generator the .tmp prefix is not needed
- this.destinationRoot(join('.tmp', this.app.package.name));
+ this.destinationRoot(join('.tmp', this.app.package.name ?? 'default-app-name'));
  }
 
  async writing(): Promise<void> {