@sap-ux/fiori-app-sub-generator 0.7.25 → 0.7.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators/app-headless/transforms.js +2 -2
- package/generators/fiori-app-generator/end.js +2 -2
- package/generators/fiori-app-generator/fioriAppGenerator.js +2 -2
- package/generators/fiori-app-generator/prompting.js +2 -2
- package/generators/fiori-app-generator/subgenHelpers.js +2 -2
- package/generators/fiori-app-generator/writing.js +3 -3
- package/generators/utils/common.js +4 -4
- package/package.json +22 -22
|
@@ -6,7 +6,7 @@ const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
|
|
|
6
6
|
const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
|
|
7
7
|
const ui5_application_inquirer_1 = require("@sap-ux/ui5-application-inquirer");
|
|
8
8
|
const ui5_info_1 = require("@sap-ux/ui5-info");
|
|
9
|
-
const
|
|
9
|
+
const node_path_1 = require("node:path");
|
|
10
10
|
const types_1 = require("../types");
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
12
|
const APP_CONFIG_CURRENT_VERSION = '0.2';
|
|
@@ -27,7 +27,7 @@ function transformExtState(appConfig) {
|
|
|
27
27
|
floorplan: types_1.FloorplanFE[floorplan] ?? types_1.FloorplanFF[floorplan]
|
|
28
28
|
};
|
|
29
29
|
if (state.service.capService) {
|
|
30
|
-
state.project.targetFolder = (0,
|
|
30
|
+
state.project.targetFolder = (0, node_path_1.join)(state.service.capService.projectPath, state.service.capService.appPath ?? '');
|
|
31
31
|
}
|
|
32
32
|
// FE specific state properties
|
|
33
33
|
if (floorplan !== 'FF_SIMPLE' && appConfig.entityConfig) {
|
|
@@ -5,7 +5,7 @@ const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
|
|
|
5
5
|
const btp_utils_1 = require("@sap-ux/btp-utils");
|
|
6
6
|
const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
|
|
7
7
|
const store_1 = require("@sap-ux/store");
|
|
8
|
-
const
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
9
|
const utils_1 = require("../utils");
|
|
10
10
|
/**
|
|
11
11
|
* Save API Hub key to the store.
|
|
@@ -101,7 +101,7 @@ async function runPostGenerationTasks({ service, project }, fs, logger, vscode,
|
|
|
101
101
|
await saveApiHubApiKey(service.apiHubConfig.apiHubKey, logger);
|
|
102
102
|
}
|
|
103
103
|
// If we got here, the generation was successful and so targetFolder and name must be defined
|
|
104
|
-
const projectPath = (0,
|
|
104
|
+
const projectPath = (0, node_path_1.join)(project.targetFolder, project.name);
|
|
105
105
|
logger.info((0, utils_1.t)('logMessages.applicationGenerationSuccess', {
|
|
106
106
|
targetFolder: projectPath
|
|
107
107
|
}));
|
|
@@ -13,7 +13,7 @@ const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
|
|
|
13
13
|
const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
|
|
14
14
|
const telemetry_1 = require("@sap-ux/telemetry");
|
|
15
15
|
const ui5_info_1 = require("@sap-ux/ui5-info");
|
|
16
|
-
const
|
|
16
|
+
const node_path_1 = require("node:path");
|
|
17
17
|
const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
|
|
18
18
|
const types_1 = require("../types");
|
|
19
19
|
const utils_1 = require("../utils");
|
|
@@ -233,7 +233,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
|
|
|
233
233
|
FioriAppGenerator.logger.info((0, utils_1.t)('logMessages.copyingTemplateFiles', { templateName: this.state.floorplan }));
|
|
234
234
|
// Set the template folder
|
|
235
235
|
// this.sourceRoot(join(__dirname, '..', '..', 'templates')); // Path must match webpacked template paths
|
|
236
|
-
const destRoot = this.destinationRoot((0,
|
|
236
|
+
const destRoot = this.destinationRoot((0, node_path_1.join)(project.targetFolder, project.name));
|
|
237
237
|
const t1 = performance.now();
|
|
238
238
|
let appConfig;
|
|
239
239
|
// Determine which type of app to generate based on the selected floorplan (template type)
|
|
@@ -14,7 +14,7 @@ const telemetry_1 = require("@sap-ux/telemetry");
|
|
|
14
14
|
const ui5_application_inquirer_1 = require("@sap-ux/ui5-application-inquirer");
|
|
15
15
|
const ui5_info_1 = require("@sap-ux/ui5-info");
|
|
16
16
|
const merge_1 = __importDefault(require("lodash/merge"));
|
|
17
|
-
const
|
|
17
|
+
const node_path_1 = require("node:path");
|
|
18
18
|
const types_1 = require("../types");
|
|
19
19
|
const utils_1 = require("../utils");
|
|
20
20
|
/**
|
|
@@ -178,7 +178,7 @@ async function createUI5ApplicationPromptOptions(ui5PromptOptions) {
|
|
|
178
178
|
if (service.capService?.projectPath) {
|
|
179
179
|
// CAP override
|
|
180
180
|
defaultTargetFolderOption = {
|
|
181
|
-
default: (0,
|
|
181
|
+
default: (0, node_path_1.join)(service.capService.projectPath, service.capService.appPath ?? '')
|
|
182
182
|
};
|
|
183
183
|
}
|
|
184
184
|
else {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addDeployGen = addDeployGen;
|
|
4
4
|
exports.addFlpGen = addFlpGen;
|
|
5
|
-
const
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
6
|
const types_1 = require("../types");
|
|
7
7
|
const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
|
|
8
8
|
/**
|
|
@@ -55,7 +55,7 @@ function addFlpGen({ projectName, targetFolder, title, skipPrompt }, composeWith
|
|
|
55
55
|
launchFlpConfigAsSubGenerator: true,
|
|
56
56
|
appWizard,
|
|
57
57
|
vscode,
|
|
58
|
-
appRootPath: (0,
|
|
58
|
+
appRootPath: (0, node_path_1.join)(targetFolder, projectName),
|
|
59
59
|
logWrapper: logger,
|
|
60
60
|
inquirerPromptOptions: promptSettings
|
|
61
61
|
};
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.writeAppGenInfoFiles = writeAppGenInfoFiles;
|
|
4
4
|
exports.writeAPIHubKeyFiles = writeAPIHubKeyFiles;
|
|
5
5
|
const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
|
|
6
|
-
const
|
|
6
|
+
const node_path_1 = require("node:path");
|
|
7
7
|
const types_1 = require("../types");
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
/**
|
|
@@ -60,7 +60,7 @@ async function writeAppGenInfoFiles({ project, service, floorplan, entityRelated
|
|
|
60
60
|
generationDate: appGenInfoCustom?.generationDate ?? new Date().toString(),
|
|
61
61
|
generatorPlatform: appGenInfoCustom?.generatorPlatform ?? (0, fiori_generator_shared_1.getHostEnvironment)().name,
|
|
62
62
|
serviceType: appGenInfoCustom?.serviceType,
|
|
63
|
-
metadataFilename: service.localEdmxFilePath ? (0,
|
|
63
|
+
metadataFilename: service.localEdmxFilePath ? (0, node_path_1.basename)(service.localEdmxFilePath) : '',
|
|
64
64
|
serviceId: service.serviceId,
|
|
65
65
|
serviceUrl: appGenInfoCustom?.serviceUrl,
|
|
66
66
|
appName: project.name,
|
|
@@ -90,7 +90,7 @@ async function writeAppGenInfoFiles({ project, service, floorplan, entityRelated
|
|
|
90
90
|
* @param apiHubConfig
|
|
91
91
|
*/
|
|
92
92
|
function writeAPIHubKeyFiles(fs, destPath, apiHubConfig) {
|
|
93
|
-
const envFilePath = (0,
|
|
93
|
+
const envFilePath = (0, node_path_1.join)(destPath, '.env');
|
|
94
94
|
const envContent = `API_HUB_API_KEY=${apiHubConfig.apiHubKey}\nAPI_HUB_TYPE=${apiHubConfig.apiHubType}`;
|
|
95
95
|
// Create .env to store apiHub integration.
|
|
96
96
|
fs.write(envFilePath, envContent);
|
|
@@ -24,7 +24,7 @@ const fiori_tools_settings_1 = require("@sap-ux/fiori-tools-settings");
|
|
|
24
24
|
const launch_config_1 = require("@sap-ux/launch-config");
|
|
25
25
|
const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
|
|
26
26
|
const project_access_1 = require("@sap-ux/project-access");
|
|
27
|
-
const
|
|
27
|
+
const node_path_1 = require("node:path");
|
|
28
28
|
const uuid_1 = require("uuid");
|
|
29
29
|
const types_1 = require("../types");
|
|
30
30
|
const constants_1 = require("../types/constants");
|
|
@@ -134,7 +134,7 @@ async function getCdsAnnotations(capService, projectName) {
|
|
|
134
134
|
const { appPath: capAppPath = 'app', projectPath, serviceCdsPath, serviceName } = capService;
|
|
135
135
|
if (serviceCdsPath) {
|
|
136
136
|
// Construct the annotation path and service cds URI
|
|
137
|
-
const annotationPath = (0,
|
|
137
|
+
const annotationPath = (0, node_path_1.join)(capAppPath, projectName, 'annotation.cds').replace(/\\/g, '/');
|
|
138
138
|
const serviceCdsUri = await (0, project_access_1.toReferenceUri)(projectPath, annotationPath, serviceCdsPath);
|
|
139
139
|
// Create the contents of the annotation CDS file
|
|
140
140
|
const annotationCdsContents = `using ${serviceName} as service from '${serviceCdsUri}';`;
|
|
@@ -218,7 +218,7 @@ async function generateLaunchConfig(options, fs, vscode, log, writeToAppOnly = f
|
|
|
218
218
|
try {
|
|
219
219
|
if (vscode) {
|
|
220
220
|
const addStartCmd = options.datasourceType !== odata_service_inquirer_1.DatasourceType.metadataFile;
|
|
221
|
-
const projectPath = (0,
|
|
221
|
+
const projectPath = (0, node_path_1.join)(options.targetFolder, options.projectName);
|
|
222
222
|
const debugOptions = {
|
|
223
223
|
vscode: vscode,
|
|
224
224
|
addStartCmd,
|
|
@@ -232,7 +232,7 @@ async function generateLaunchConfig(options, fs, vscode, log, writeToAppOnly = f
|
|
|
232
232
|
debugOptions.odataVersion = options.odataVersion === odata_service_inquirer_1.OdataVersion.v2 ? '2.0' : '4.0';
|
|
233
233
|
}
|
|
234
234
|
const fioriOptions = {
|
|
235
|
-
name: (0,
|
|
235
|
+
name: (0, node_path_1.basename)(options.projectName),
|
|
236
236
|
projectRoot: projectPath,
|
|
237
237
|
startFile: options?.enableVirtualEndpoints ? 'test/flp.html' : undefined,
|
|
238
238
|
debugOptions
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap-ux/fiori-app-sub-generator",
|
|
3
3
|
"description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
|
|
4
|
-
"version": "0.7.
|
|
4
|
+
"version": "0.7.27",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/SAP/open-ux-tools.git",
|
|
@@ -29,23 +29,23 @@
|
|
|
29
29
|
"mem-fs-editor": "9.4.0",
|
|
30
30
|
"uuid": "11.0.5",
|
|
31
31
|
"yeoman-generator": "5.10.0",
|
|
32
|
-
"@sap-ux/annotation-generator": "0.3.
|
|
33
|
-
"@sap-ux/axios-extension": "1.22.
|
|
32
|
+
"@sap-ux/annotation-generator": "0.3.65",
|
|
33
|
+
"@sap-ux/axios-extension": "1.22.10",
|
|
34
|
+
"@sap-ux/btp-utils": "1.1.4",
|
|
35
|
+
"@sap-ux/cap-config-writer": "0.12.12",
|
|
34
36
|
"@sap-ux/feature-toggle": "0.3.1",
|
|
35
|
-
"@sap-ux/fiori-elements-writer": "2.7.
|
|
36
|
-
"@sap-ux/fiori-freestyle-writer": "2.4.
|
|
37
|
-
"@sap-ux/
|
|
38
|
-
"@sap-ux/fiori-
|
|
39
|
-
"@sap-ux/
|
|
40
|
-
"@sap-ux/
|
|
41
|
-
"@sap-ux/
|
|
42
|
-
"@sap-ux/
|
|
43
|
-
"@sap-ux/
|
|
44
|
-
"@sap-ux/
|
|
45
|
-
"@sap-ux/
|
|
46
|
-
"@sap-ux/
|
|
47
|
-
"@sap-ux/ui5-application-inquirer": "0.15.12",
|
|
48
|
-
"@sap-ux/ui5-info": "0.12.3"
|
|
37
|
+
"@sap-ux/fiori-elements-writer": "2.7.17",
|
|
38
|
+
"@sap-ux/fiori-freestyle-writer": "2.4.49",
|
|
39
|
+
"@sap-ux/fiori-generator-shared": "0.13.21",
|
|
40
|
+
"@sap-ux/fiori-tools-settings": "0.2.1",
|
|
41
|
+
"@sap-ux/launch-config": "0.10.27",
|
|
42
|
+
"@sap-ux/odata-service-inquirer": "2.8.9",
|
|
43
|
+
"@sap-ux/odata-service-writer": "0.27.24",
|
|
44
|
+
"@sap-ux/project-access": "1.32.3",
|
|
45
|
+
"@sap-ux/store": "1.1.5",
|
|
46
|
+
"@sap-ux/telemetry": "0.6.27",
|
|
47
|
+
"@sap-ux/ui5-application-inquirer": "0.15.14",
|
|
48
|
+
"@sap-ux/ui5-info": "0.12.4"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@sap-devx/yeoman-ui-types": "1.16.9",
|
|
@@ -62,11 +62,11 @@
|
|
|
62
62
|
"mock-spawn": "0.2.6",
|
|
63
63
|
"rimraf": "5.0.5",
|
|
64
64
|
"yeoman-test": "6.3.0",
|
|
65
|
-
"@sap-ux/deploy-config-sub-generator": "0.4.
|
|
66
|
-
"@sap-ux/flp-config-sub-generator": "0.3.
|
|
67
|
-
"@sap-ux/inquirer-common": "0.7.
|
|
68
|
-
"@sap-ux/
|
|
69
|
-
"@sap-ux/
|
|
65
|
+
"@sap-ux/deploy-config-sub-generator": "0.4.19",
|
|
66
|
+
"@sap-ux/flp-config-sub-generator": "0.3.31",
|
|
67
|
+
"@sap-ux/inquirer-common": "0.7.48",
|
|
68
|
+
"@sap-ux/jest-file-matchers": "0.2.5",
|
|
69
|
+
"@sap-ux/logger": "0.7.0"
|
|
70
70
|
},
|
|
71
71
|
"engines": {
|
|
72
72
|
"node": ">=20.x"
|