Skip to content

Commit 8d9919a

Browse files
committed
Merge remote-tracking branch 'origin/main' into eslint9
* origin/main: (46 commits) chore(deps): update dependency @types/inquirer-autocomplete-prompt to v2.0.2 (#1651) chore: apply latest changesets Fix UI5 1.120.x linting for basic template, fix warnings (#3434) fix: remove filtering of parameters for inbounds (#3440) chore: apply latest changesets fix: provide templates path parameter to handle different runtime context (#3464) chore: apply latest changesets fix(fiori-gen): updates FioriAppGeneratorPromptSettings type (#3474) chore: apply latest changesets fiori-sub-gen: update `FioriGeneratorPromptExtension` types (#3444) fix(deps): update jest monorepo to v30 (major) (#3362) chore: apply latest changesets fix(repo-app-import-sub-generator): set only css: [] in manifest to fix lint error (#3468) chore: apply latest changesets feat(odata-service-inq): set analytical table when supported by main entity (#3467) Project modules update 22.07.2025 (4690) (#3462) chore: apply latest changesets move headless AppConfig type and associated types to fiori gen shared module (#3466) fix: sonar issue for prompting examples (#3460) chore: delete cards editor middlewares (#3454) ...
2 parents 8ff10dd + e9544aa commit 8d9919a

File tree

536 files changed

+10056
-6255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

536 files changed

+10056
-6255
lines changed

docs/deleted-packages.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Deleted Packages
2+
3+
This document lists the packages that have been deleted and their reasons.
4+
5+
| Package Name | Pull Request | Reason |
6+
|--------------------------------------| ----------------------------------------------- |-----------------------------------------------------------------|
7+
| `@sap-ux/cards-editor-middleware` | https://github.com/SAP/open-ux-tools/pull/3454 | functionality has been integrated in package preview-middleware |
8+
| `@sap-ux/cards-editor-config-writer` | https://github.com/SAP/open-ux-tools/pull/3454 | functionality has been integrated in package app-config-writer |

docs/tools-offline-instructions/info/projectModules.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,18 @@
4040
"@sap/eslint-plugin-ui5-jsdocs": [
4141
"2.0.5"
4242
],
43-
"@sap/html5-repo-mock": [
44-
"^2.1.0"
45-
],
4643
"@sap/ui5-builder-webide-extension": [
4744
"1.0.5",
4845
"1.0.x"
4946
],
5047
"@sap/ux-specification": [
51-
"1.71.135",
52-
"1.108.56",
53-
"1.120.37",
54-
"1.124.19",
55-
"1.136.0",
56-
"1.84.115",
57-
"1.96.89"
48+
"1.71.137",
49+
"1.108.58",
50+
"1.120.39",
51+
"1.124.21",
52+
"1.136.2",
53+
"1.84.117",
54+
"1.96.91"
5855
],
5956
"@sap/ux-ui5-tooling": [
6057
"1.11.4",
@@ -103,7 +100,7 @@
103100
"2.6.7"
104101
],
105102
"gulp": [
106-
"^4.0.2"
103+
"^5.0.1"
107104
],
108105
"gulp-cached": [
109106
"^1.1.1"

esbuildConfig.js

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -77,39 +77,32 @@ const handleCliParams = (options, args = []) => {
7777

7878
return outOptions;
7979
};
80-
const build = (options, args) => {
80+
const build = async (options, args) => {
8181
const finalConfig = handleCliParams(options, args);
82-
if (finalConfig.watch) {
83-
// needed by https://github.com/connor4312/esbuild-problem-matchers if installed in vscode
84-
finalConfig.watch = {
85-
onRebuild(error, result) {
86-
console.log('[watch] build started');
87-
if (error) {
88-
error.errors.forEach((error) =>
89-
console.error(
90-
`> ${error.location.file}:${error.location.line}:${error.location.column}: error: ${error.text}`
91-
)
92-
);
93-
} else console.log('[watch] build finished');
94-
}
95-
};
96-
}
97-
require('esbuild')
98-
.build(finalConfig)
99-
.then((result) => {
100-
if (finalConfig.metafile) {
101-
const statsFile = 'esbuild-stats.json';
102-
writeFileSync(statsFile, JSON.stringify(result.metafile));
103-
console.log(`Wrote esbuild stats file ${statsFile}. Analyse at https://bundle-buddy.com/esbuild/`);
104-
}
105-
})
106-
.then(() => {
107-
console.log('[watch] build finished');
108-
})
109-
.catch((error) => {
110-
console.log(error.message);
111-
process.exit(1);
112-
});
82+
const esbuild = require('esbuild');
83+
const isWatch = finalConfig.watch;
84+
delete finalConfig.watch;
85+
if (isWatch) {
86+
const contextObj = await esbuild.context(finalConfig);
87+
await contextObj.watch();
88+
console.log('[watch] build started');
89+
} else {
90+
esbuild.build(finalConfig)
91+
.then((result) => {
92+
if (finalConfig.metafile) {
93+
const statsFile = 'esbuild-stats.json';
94+
writeFileSync(statsFile, JSON.stringify(result.metafile));
95+
console.log(`Wrote esbuild stats file ${statsFile}. Analyse at https://bundle-buddy.com/esbuild/`);
96+
}
97+
})
98+
.then(() => {
99+
console.log('[build] build finished');
100+
})
101+
.catch((error) => {
102+
console.log(error.message);
103+
process.exit(1);
104+
});
105+
}
113106
};
114107
module.exports = {
115108
esbuildOptionsBrowser: { ...commonConfig, ...browserConfig },

examples/simple-generator/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# @sap-ux/generator-simple-fe
22

3+
## 1.1.43
4+
5+
### Patch Changes
6+
7+
- @sap-ux/fiori-elements-writer@2.5.15
8+
- @sap-ux/fiori-freestyle-writer@2.4.26
9+
10+
## 1.1.42
11+
12+
### Patch Changes
13+
14+
- @sap-ux/fiori-elements-writer@2.5.14
15+
- @sap-ux/fiori-freestyle-writer@2.4.25
16+
17+
## 1.1.41
18+
19+
### Patch Changes
20+
21+
- @sap-ux/fiori-elements-writer@2.5.13
22+
- @sap-ux/fiori-freestyle-writer@2.4.24
23+
324
## 1.1.40
425

526
### Patch Changes

examples/simple-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/generator-simple-fe",
3-
"version": "1.1.40",
3+
"version": "1.1.43",
44
"description": "Simple example of a yeoman generator for Fiori elements.",
55
"license": "Apache-2.0",
66
"private": true,

examples/ui-prompting-examples/src/addons/preview/component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ getWebSocket(false);
88

99
type SupportedLanguages = 'html' | 'json';
1010

11-
export const render = (props: { active?: boolean }): React.ReactElement => {
11+
export const CodePreview = (props: { active?: boolean }): React.ReactElement => {
1212
const { active = false } = props;
1313
const [preview, setPreview] = useState<{
1414
codeSnippets: { content: string; fileName: string; language: SupportedLanguages }[];

examples/ui-prompting-examples/src/addons/project/component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export const ProjectPathForm = memo(() => {
173173

174174
ProjectPathForm.displayName = 'ProjectPathForm';
175175

176-
export const render = (props: { active?: boolean }): React.ReactElement => {
176+
export const ProjectSelector = (props: { active?: boolean }): React.ReactElement => {
177177
const { active = false } = props;
178178
return (
179179
<AddonPanel key="panel" active={active}>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
import { addons, types } from '@storybook/addons';
2-
import { render as renderPreview } from './preview/component';
3-
import { render as renderProject } from './project/component';
2+
import { CodePreview } from './preview/component';
3+
import { ProjectSelector } from './project/component';
44

55
const ADDONS = [
66
{
77
id: 'code-preview',
88
title: 'Code preview',
9-
render: renderPreview
9+
component: CodePreview
1010
},
1111
{
1212
id: 'project-selector',
1313
title: 'Project path',
14-
render: renderProject
14+
component: ProjectSelector
1515
}
1616
];
1717

1818
for (const addon of ADDONS) {
19-
const { id, render, title } = addon;
19+
const { id, component, title } = addon;
2020
addons.register(id, () => {
2121
addons.add(id, {
2222
title: title,
2323
type: types.PANEL,
2424
match: ({ viewMode }) => !!viewMode?.match(/^(story|docs)$/),
25-
render: render
25+
render: component
2626
});
2727
});
2828
}

package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
"@eslint/eslintrc": "3.3.0",
1111
"@eslint/js": "9.22.0",
1212
"@playwright/test": "1.50.1",
13-
"@types/jest": "29.5.5",
13+
"@types/jest": "30.0.0",
1414
"@types/node": "18.11.9",
15+
"autoprefixer": "10.4.7",
1516
"check-dependency-version-consistency": "5.0.0",
16-
"esbuild": "0.14.49",
17-
"esbuild-sass-plugin": "2.3.1",
17+
"esbuild": "0.25.6",
18+
"esbuild-sass-plugin": "3.3.1",
1819
"eslint": "9.29.0",
1920
"eslint-config-prettier": "10.1.1",
2021
"eslint-import-resolver-typescript": "4.2.2",
@@ -26,17 +27,21 @@
2627
"typescript-eslint": "8.34.1",
2728
"globals": "16.0.0",
2829
"husky": "8.0.3",
29-
"jest": "29.7.0",
30+
"jest": "30.0.1",
3031
"jest-sonar": "0.2.16",
3132
"npm-run-all2": "7.0.2",
3233
"nx": "21.0.3",
34+
"postcss": "8.5.1",
3335
"prebuild-install": "^7.0.1",
3436
"prettier": "3.5.3",
3537
"pretty-quick": "3.1.3",
38+
"react-select": "5.8.0",
39+
"react-virtualized": "9.22.5",
3640
"rimraf": "5.0.5",
37-
"ts-jest": "29.1.2",
41+
"ts-jest": "29.4.0",
3842
"typescript": "5.8.3",
39-
"update-ts-references": "3.2.1"
43+
"update-ts-references": "3.2.1",
44+
"yargs-parser": "21.1.1"
4045
},
4146
"scripts": {
4247
"postinstall": "update-ts-references",

packages/abap-deploy-config-inquirer/CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
11
# @sap-ux/abap-deploy-config-inquirer
22

3+
## 1.5.0
4+
5+
### Minor Changes
6+
7+
- 089b56f: updates extension types and extends prompt options in sub gens
8+
9+
## 1.4.38
10+
11+
### Patch Changes
12+
13+
- Updated dependencies [ca44076]
14+
- @sap-ux/fiori-generator-shared@0.13.3
15+
- @sap-ux/inquirer-common@0.7.27
16+
17+
## 1.4.37
18+
19+
### Patch Changes
20+
21+
- @sap-ux/inquirer-common@0.7.26
22+
23+
## 1.4.36
24+
25+
### Patch Changes
26+
27+
- Updated dependencies [84a8d56]
28+
- @sap-ux/nodejs-utils@0.2.2
29+
30+
## 1.4.35
31+
32+
### Patch Changes
33+
34+
- Updated dependencies [485ae8d]
35+
- @sap-ux/guided-answers-helper@0.3.1
36+
- @sap-ux/inquirer-common@0.7.25
37+
38+
## 1.4.34
39+
40+
### Patch Changes
41+
42+
- Updated dependencies [d75db00]
43+
- @sap-ux/fiori-generator-shared@0.13.2
44+
- @sap-ux/inquirer-common@0.7.24
45+
346
## 1.4.33
447

548
### Patch Changes

0 commit comments

Comments
 (0)