@sap/ux-ui5-tooling 1.9.5 → 1.9.7
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/dist/cli/index.js +168 -42
- package/dist/middlewares/fiori-tools-preview.js +32 -40
- package/dist/middlewares/fiori-tools-proxy.js +42 -50
- package/dist/tasks/cf-deploy/index.js +169 -41
- package/dist/tasks/deploy/index.js +167 -41
- package/dist/templates/control-property-editor/app.js +40 -40
- package/package.json +10 -10
package/dist/cli/index.js
CHANGED
|
@@ -55663,7 +55663,7 @@ var require_ui5AbapRepository = __commonJS({
|
|
|
55663
55663
|
}
|
|
55664
55664
|
return isExisting ? await httpClient.put(`/Repositories('${encodeURIComponent(appName)}')`, payload, config2) : await httpClient.post("/Repositories", payload, config2);
|
|
55665
55665
|
} catch (error3) {
|
|
55666
|
-
if (((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status)
|
|
55666
|
+
if ([504, 408].includes((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status)) {
|
|
55667
55667
|
if (tryCount >= 3) {
|
|
55668
55668
|
throw error3;
|
|
55669
55669
|
}
|
|
@@ -69448,7 +69448,7 @@ var require_package5 = __commonJS({
|
|
|
69448
69448
|
"../lib/telemetry/dist/package.json"(exports2, module2) {
|
|
69449
69449
|
module2.exports = {
|
|
69450
69450
|
name: "@sap/ux-telemetry",
|
|
69451
|
-
version: "1.9.
|
|
69451
|
+
version: "1.9.7",
|
|
69452
69452
|
description: "SAP Fiori tools telemetry library",
|
|
69453
69453
|
main: "dist/src/index.js",
|
|
69454
69454
|
author: "SAP SE",
|
|
@@ -69473,10 +69473,10 @@ var require_package5 = __commonJS({
|
|
|
69473
69473
|
},
|
|
69474
69474
|
dependencies: {
|
|
69475
69475
|
"@sap-ux/store": "0.3.8",
|
|
69476
|
-
"@sap/ux-cds": "1.9.
|
|
69477
|
-
"@sap/ux-common-utils": "1.9.
|
|
69478
|
-
"@sap/ux-feature-toggle": "1.9.
|
|
69479
|
-
"@sap/ux-project-access": "1.9.
|
|
69476
|
+
"@sap/ux-cds": "1.9.7",
|
|
69477
|
+
"@sap/ux-common-utils": "1.9.7",
|
|
69478
|
+
"@sap/ux-feature-toggle": "1.9.7",
|
|
69479
|
+
"@sap/ux-project-access": "1.9.7",
|
|
69480
69480
|
applicationinsights: "1.4.1",
|
|
69481
69481
|
axios: "0.26.0",
|
|
69482
69482
|
"performance-now": "2.1.0",
|
|
@@ -69486,7 +69486,7 @@ var require_package5 = __commonJS({
|
|
|
69486
69486
|
memfs: "3.4.13",
|
|
69487
69487
|
"ts-jest": "29.0.5",
|
|
69488
69488
|
"ts-node": "8.5.2",
|
|
69489
|
-
typescript: "4.9.
|
|
69489
|
+
typescript: "4.9.5",
|
|
69490
69490
|
unionfs: "4.4.0"
|
|
69491
69491
|
},
|
|
69492
69492
|
files: [
|
|
@@ -77078,37 +77078,32 @@ var require_utils10 = __commonJS({
|
|
|
77078
77078
|
try {
|
|
77079
77079
|
await findProject(root, projects);
|
|
77080
77080
|
} catch (error3) {
|
|
77081
|
-
|
|
77082
|
-
root,
|
|
77083
|
-
error: error3.message
|
|
77084
|
-
});
|
|
77085
|
-
if (logger) {
|
|
77086
|
-
logger.error(errorMessage);
|
|
77087
|
-
} else {
|
|
77088
|
-
console.error(errorMessage);
|
|
77089
|
-
}
|
|
77081
|
+
logError(error3, "ERROR_PROJECT_ROOT_WORKSPACE", logger);
|
|
77090
77082
|
}
|
|
77091
77083
|
}
|
|
77092
77084
|
return projects;
|
|
77093
77085
|
}
|
|
77094
|
-
|
|
77086
|
+
function logError(error3, i18nText, logger) {
|
|
77087
|
+
const errorMessage = i18n_1.i18n.t(i18nText, {
|
|
77088
|
+
error: error3.message
|
|
77089
|
+
});
|
|
77090
|
+
if (logger) {
|
|
77091
|
+
logger.error(errorMessage);
|
|
77092
|
+
} else {
|
|
77093
|
+
console.error(errorMessage);
|
|
77094
|
+
}
|
|
77095
|
+
}
|
|
77096
|
+
async function findAllProjectRoots(wsFolders, sapuxRequired = true, logger, includeAdaptationProjects) {
|
|
77095
77097
|
const projects = await findAllPackageJsonFolders(wsFolders, logger);
|
|
77096
77098
|
if (sapuxRequired) {
|
|
77097
77099
|
const sapuxProjects = [];
|
|
77098
77100
|
for (const root of projects) {
|
|
77099
77101
|
try {
|
|
77100
|
-
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux) {
|
|
77102
|
+
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux || includeAdaptationProjects && await isAdaptationProject(root)) {
|
|
77101
77103
|
sapuxProjects.push(root);
|
|
77102
77104
|
}
|
|
77103
77105
|
} catch (error3) {
|
|
77104
|
-
|
|
77105
|
-
error: error3.message
|
|
77106
|
-
});
|
|
77107
|
-
if (logger) {
|
|
77108
|
-
logger.error(errorMessage);
|
|
77109
|
-
} else {
|
|
77110
|
-
console.error(errorMessage);
|
|
77111
|
-
}
|
|
77106
|
+
logError(error3, "ERROR_INVALID_PACKAGE_JSON", logger);
|
|
77112
77107
|
}
|
|
77113
77108
|
}
|
|
77114
77109
|
return sapuxProjects;
|
|
@@ -77253,14 +77248,7 @@ var require_utils10 = __commonJS({
|
|
|
77253
77248
|
result2.push(root);
|
|
77254
77249
|
}
|
|
77255
77250
|
} catch (error3) {
|
|
77256
|
-
|
|
77257
|
-
root
|
|
77258
|
-
});
|
|
77259
|
-
if (logger) {
|
|
77260
|
-
logger.error(errorMessage);
|
|
77261
|
-
} else {
|
|
77262
|
-
console.error(errorMessage);
|
|
77263
|
-
}
|
|
77251
|
+
logError(error3, "ERROR_INVALIND_PACKAGE_JSON_FOR_APP", logger);
|
|
77264
77252
|
}
|
|
77265
77253
|
}
|
|
77266
77254
|
return result2;
|
|
@@ -96010,12 +95998,16 @@ var require_toolsSuiteTelemetrySettings = __commonJS({
|
|
|
96010
95998
|
return path_1.default.join(homedir3, settingsPath);
|
|
96011
95999
|
};
|
|
96012
96000
|
var setEnableTelemetry = async (enableTelemetry) => {
|
|
96013
|
-
|
|
96014
|
-
|
|
96015
|
-
|
|
96016
|
-
|
|
96017
|
-
|
|
96018
|
-
|
|
96001
|
+
try {
|
|
96002
|
+
const storeService = await (0, store_1.getService)({
|
|
96003
|
+
entityName: "telemetrySetting"
|
|
96004
|
+
});
|
|
96005
|
+
const setting = new store_1.TelemetrySetting({ enableTelemetry });
|
|
96006
|
+
await storeService.write(setting);
|
|
96007
|
+
system_1.TelemetrySystem.telemetryEnabled = enableTelemetry;
|
|
96008
|
+
} catch (e) {
|
|
96009
|
+
console.error(`Telemetry settings could not be written. Error : ${e.message}`);
|
|
96010
|
+
}
|
|
96019
96011
|
const commonProperties = await (0, toolsSuiteTelemetryDataProcessor_1.getCommonProperties)();
|
|
96020
96012
|
(0, reporting_1.reportEnableTelemetryOnOff)(enableTelemetry, commonProperties);
|
|
96021
96013
|
};
|
|
@@ -166807,6 +166799,140 @@ async function deployWithRetry(archive, config2, log7) {
|
|
|
166807
166799
|
await requestWithRetry(deploy2, [401, 412], config2, log7);
|
|
166808
166800
|
}
|
|
166809
166801
|
|
|
166802
|
+
// package.json
|
|
166803
|
+
var package_default = {
|
|
166804
|
+
name: "@sap/ux-ui5-tooling",
|
|
166805
|
+
displayName: "SAP Fiori Tools \u2013 UI5 Tooling",
|
|
166806
|
+
version: "1.9.7",
|
|
166807
|
+
description: "SAP Fiori Tools \u2013 UI5 Tooling",
|
|
166808
|
+
publisher: "SAPSE",
|
|
166809
|
+
license: "SEE LICENSE IN LICENSE",
|
|
166810
|
+
bin: {
|
|
166811
|
+
fiori: "bin/fiori"
|
|
166812
|
+
},
|
|
166813
|
+
private: false,
|
|
166814
|
+
scripts: {
|
|
166815
|
+
"clean:dist": "rimraf ./dist ./generators *.tsbuildinfo",
|
|
166816
|
+
clean: "rimraf ./.webpack_cache",
|
|
166817
|
+
"build:compile": "tsc --build ./ --pretty --dry",
|
|
166818
|
+
"build:bundle": "node esbuild.js",
|
|
166819
|
+
"build:copyTemplates1": "copyfiles --error --flat -V ../lib/app-templates/templates/variants-management/** ./dist/templates/variants-management",
|
|
166820
|
+
"build:copyTemplates2": "copyfiles --error --flat -V ../lib/app-templates/templates/control-property-editor/** ./dist/templates/control-property-editor",
|
|
166821
|
+
"build:copyTemplates3": "copyfiles --error --flat -V ../control-property-editor/dist/** ./dist/templates/control-property-editor",
|
|
166822
|
+
"build:copyTemplates4": "copyfiles --error --flat -V views/** ./dist/views",
|
|
166823
|
+
"build:copyTemplates5": "copyfiles --error -V src/markdowns/**/*.* ./dist/ -u 1",
|
|
166824
|
+
watch: "yarn clean && node esbuild --watch --minify=false",
|
|
166825
|
+
build: "npm-run-all -l -s clean -p build:compile build:bundle build:copyTemplates1 build:copyTemplates2 build:copyTemplates3 build:copyTemplates4 build:copyTemplates5",
|
|
166826
|
+
"build:deps": "yarn lerna run --concurrency 1 --no-bail --stream --scope @sap/ux-telemetry --scope @sap/ux-odata-client --scope @sap/ux-common-utils --scope @sap/ux-store --scope @sap/ux-app-templates build",
|
|
166827
|
+
bundle: "yarn build:deps && yarn build && npm pack",
|
|
166828
|
+
test: "cross-env SAP_UX_FIORI_TOOLS_DISABLE_TELEMETRY=true jest --maxWorkers=1 --ci --forceExit --detectOpenHandles",
|
|
166829
|
+
"test:sequence": "node -r ts-node/register test/sample-project/app/request-sequence.ts",
|
|
166830
|
+
lint: "eslint . --ext .ts,.tsx",
|
|
166831
|
+
"lint:summary": "eslint . --ext .ts,.tsx -f summary",
|
|
166832
|
+
"lint:fix": "eslint --fix",
|
|
166833
|
+
"lint:fix:all": "eslint . --ext .ts,.tsx --fix",
|
|
166834
|
+
"lint:report": "eslint . --ext .ts,.tsx -f multiple ",
|
|
166835
|
+
"format:fix": "prettier --write --loglevel silent --ignore-path ../../../.prettierignore",
|
|
166836
|
+
"format:fix:all": "prettier --write '**/*.{css,scss,html,js,json,ts,tsx,yaml,yml}' '!**/{out,dist,typings,node_modules}/**' '!**/*.{svg,png,xml}' --ignore-path ../../../.prettierignore",
|
|
166837
|
+
"tgz:package": "npm pack",
|
|
166838
|
+
madge: "madge --warning --circular --extensions ts ./"
|
|
166839
|
+
},
|
|
166840
|
+
dependencies: {
|
|
166841
|
+
"@ui5/fs": "^2.0.6",
|
|
166842
|
+
debug: "4.3.4",
|
|
166843
|
+
express: "4.17.3",
|
|
166844
|
+
livereload: "0.9.1",
|
|
166845
|
+
semver: "7.3.5",
|
|
166846
|
+
"update-notifier-cjs": "5.1.5"
|
|
166847
|
+
},
|
|
166848
|
+
optionalDependencies: {
|
|
166849
|
+
keytar: "7.9.0"
|
|
166850
|
+
},
|
|
166851
|
+
devDependencies: {
|
|
166852
|
+
"@sap-ux/backend-proxy-middleware": "0.6.45",
|
|
166853
|
+
"@sap-ux/logger": "0.3.5",
|
|
166854
|
+
"@sap-ux/store": "0.3.8",
|
|
166855
|
+
"@sap-ux/ui5-config": "0.16.6",
|
|
166856
|
+
"@sap-ux/ui5-proxy-middleware": "1.1.25",
|
|
166857
|
+
"@sap/ux-app-templates": "1.9.7",
|
|
166858
|
+
"@sap/ux-cds": "1.9.7",
|
|
166859
|
+
"@sap/ux-common-utils": "1.9.7",
|
|
166860
|
+
"@sap/ux-control-property-editor": "1.9.7",
|
|
166861
|
+
"@sap/ux-odata-client": "1.9.7",
|
|
166862
|
+
"@sap/ux-telemetry": "1.9.7",
|
|
166863
|
+
"@sap/ux-ui5-info": "1.9.7",
|
|
166864
|
+
"@sapux/project-spec": "1.9.7",
|
|
166865
|
+
"@types/marked": "4.0.1",
|
|
166866
|
+
"@types/prompts": "2.0.14",
|
|
166867
|
+
"@types/supertest": "2.0.12",
|
|
166868
|
+
"@types/yazl": "2.4.2",
|
|
166869
|
+
"@ui5/logger": "2.0.1",
|
|
166870
|
+
"async-retry": "1.3.1",
|
|
166871
|
+
axios: "0.26.0",
|
|
166872
|
+
chalk: "4.1.2",
|
|
166873
|
+
"connect-livereload": "0.6.1",
|
|
166874
|
+
"cross-env": "6.0.3",
|
|
166875
|
+
dotenv: "8.2.0",
|
|
166876
|
+
ejs: "3.1.8",
|
|
166877
|
+
hasbin: "1.2.3",
|
|
166878
|
+
"http-proxy-middleware": "2.0.1",
|
|
166879
|
+
i18next: "19.0.2",
|
|
166880
|
+
lodash: "4.17.21",
|
|
166881
|
+
marked: "4.0.10",
|
|
166882
|
+
"marked-terminal": "4.2.0",
|
|
166883
|
+
"mock-http-server": "1.4.5",
|
|
166884
|
+
nock: "13.2.4",
|
|
166885
|
+
portfinder: "1.0.28",
|
|
166886
|
+
prompts: "2.4.2",
|
|
166887
|
+
"request-promise": "4.2.5",
|
|
166888
|
+
"serve-static": "1.14.1",
|
|
166889
|
+
supertest: "6.3.3",
|
|
166890
|
+
typescript: "4.9.5",
|
|
166891
|
+
"wait-for-expect": "3.0.2",
|
|
166892
|
+
yaml: "2.2.2",
|
|
166893
|
+
"yargs-parser": "20.2.6",
|
|
166894
|
+
yazl: "2.5.1"
|
|
166895
|
+
},
|
|
166896
|
+
ui5: {
|
|
166897
|
+
dependencies: []
|
|
166898
|
+
},
|
|
166899
|
+
files: [
|
|
166900
|
+
"bin",
|
|
166901
|
+
"dist",
|
|
166902
|
+
"doc",
|
|
166903
|
+
"README.md",
|
|
166904
|
+
"CHANGELOG.md",
|
|
166905
|
+
"package.json",
|
|
166906
|
+
"ui5.yaml",
|
|
166907
|
+
"!*.tsbuildinfo",
|
|
166908
|
+
"!**/*.tsbuildinfo",
|
|
166909
|
+
"!*.map",
|
|
166910
|
+
"!**/*.map"
|
|
166911
|
+
],
|
|
166912
|
+
jestSonar: {
|
|
166913
|
+
reportPath: "reports/test/unit",
|
|
166914
|
+
reportFile: "test-report.xml"
|
|
166915
|
+
},
|
|
166916
|
+
"eslint-formatter-multiple": {
|
|
166917
|
+
formatters: [
|
|
166918
|
+
{
|
|
166919
|
+
name: "stylish",
|
|
166920
|
+
output: "console"
|
|
166921
|
+
},
|
|
166922
|
+
{
|
|
166923
|
+
name: "json",
|
|
166924
|
+
output: "file",
|
|
166925
|
+
path: "reports/lint/eslint.json"
|
|
166926
|
+
},
|
|
166927
|
+
{
|
|
166928
|
+
name: "checkstyle",
|
|
166929
|
+
output: "file",
|
|
166930
|
+
path: "reports/lint/eslint.checkstyle.xml"
|
|
166931
|
+
}
|
|
166932
|
+
]
|
|
166933
|
+
}
|
|
166934
|
+
};
|
|
166935
|
+
|
|
166810
166936
|
// src/tasks/deploy/index.ts
|
|
166811
166937
|
var chalk = require_source7();
|
|
166812
166938
|
async function task({ workspace, options: options3 }) {
|
|
@@ -166822,7 +166948,7 @@ async function task({ workspace, options: options3 }) {
|
|
|
166822
166948
|
log7.info(i18next_default.t("DEPLOY_CANCELED"));
|
|
166823
166949
|
return;
|
|
166824
166950
|
}
|
|
166825
|
-
await (0, import_ux_telemetry2.initTelemetrySettings)();
|
|
166951
|
+
await (0, import_ux_telemetry2.initTelemetrySettings)({ modulePackageJson: package_default });
|
|
166826
166952
|
const markName = import_ux_telemetry2.PerformanceMeasurementAPI.startMark("LOADING_TIME");
|
|
166827
166953
|
try {
|
|
166828
166954
|
let finalWorkspace = workspace;
|
|
@@ -167176,7 +167302,7 @@ init_i18next();
|
|
|
167176
167302
|
var import_yaml7 = __toESM(require_dist3());
|
|
167177
167303
|
var log6 = (0, import_logger5.getLogger)("cf spaces");
|
|
167178
167304
|
async function task3(args = []) {
|
|
167179
|
-
await (0, import_ux_telemetry3.initTelemetrySettings)();
|
|
167305
|
+
await (0, import_ux_telemetry3.initTelemetrySettings)({ modulePackageJson: package_default });
|
|
167180
167306
|
const markName = import_ux_telemetry3.PerformanceMeasurementAPI.startMark("LOADING_TIME");
|
|
167181
167307
|
let cfAuthenticated = true;
|
|
167182
167308
|
try {
|
|
@@ -33915,7 +33915,7 @@ var require_ui5AbapRepository = __commonJS({
|
|
|
33915
33915
|
}
|
|
33916
33916
|
return isExisting ? await httpClient.put(`/Repositories('${encodeURIComponent(appName)}')`, payload, config2) : await httpClient.post("/Repositories", payload, config2);
|
|
33917
33917
|
} catch (error3) {
|
|
33918
|
-
if (((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status)
|
|
33918
|
+
if ([504, 408].includes((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status)) {
|
|
33919
33919
|
if (tryCount >= 3) {
|
|
33920
33920
|
throw error3;
|
|
33921
33921
|
}
|
|
@@ -53826,7 +53826,7 @@ var require_package6 = __commonJS({
|
|
|
53826
53826
|
"../lib/telemetry/dist/package.json"(exports2, module2) {
|
|
53827
53827
|
module2.exports = {
|
|
53828
53828
|
name: "@sap/ux-telemetry",
|
|
53829
|
-
version: "1.9.
|
|
53829
|
+
version: "1.9.7",
|
|
53830
53830
|
description: "SAP Fiori tools telemetry library",
|
|
53831
53831
|
main: "dist/src/index.js",
|
|
53832
53832
|
author: "SAP SE",
|
|
@@ -53851,10 +53851,10 @@ var require_package6 = __commonJS({
|
|
|
53851
53851
|
},
|
|
53852
53852
|
dependencies: {
|
|
53853
53853
|
"@sap-ux/store": "0.3.8",
|
|
53854
|
-
"@sap/ux-cds": "1.9.
|
|
53855
|
-
"@sap/ux-common-utils": "1.9.
|
|
53856
|
-
"@sap/ux-feature-toggle": "1.9.
|
|
53857
|
-
"@sap/ux-project-access": "1.9.
|
|
53854
|
+
"@sap/ux-cds": "1.9.7",
|
|
53855
|
+
"@sap/ux-common-utils": "1.9.7",
|
|
53856
|
+
"@sap/ux-feature-toggle": "1.9.7",
|
|
53857
|
+
"@sap/ux-project-access": "1.9.7",
|
|
53858
53858
|
applicationinsights: "1.4.1",
|
|
53859
53859
|
axios: "0.26.0",
|
|
53860
53860
|
"performance-now": "2.1.0",
|
|
@@ -53864,7 +53864,7 @@ var require_package6 = __commonJS({
|
|
|
53864
53864
|
memfs: "3.4.13",
|
|
53865
53865
|
"ts-jest": "29.0.5",
|
|
53866
53866
|
"ts-node": "8.5.2",
|
|
53867
|
-
typescript: "4.9.
|
|
53867
|
+
typescript: "4.9.5",
|
|
53868
53868
|
unionfs: "4.4.0"
|
|
53869
53869
|
},
|
|
53870
53870
|
files: [
|
|
@@ -64459,37 +64459,32 @@ var require_utils10 = __commonJS({
|
|
|
64459
64459
|
try {
|
|
64460
64460
|
await findProject(root, projects);
|
|
64461
64461
|
} catch (error3) {
|
|
64462
|
-
|
|
64463
|
-
root,
|
|
64464
|
-
error: error3.message
|
|
64465
|
-
});
|
|
64466
|
-
if (logger) {
|
|
64467
|
-
logger.error(errorMessage);
|
|
64468
|
-
} else {
|
|
64469
|
-
console.error(errorMessage);
|
|
64470
|
-
}
|
|
64462
|
+
logError(error3, "ERROR_PROJECT_ROOT_WORKSPACE", logger);
|
|
64471
64463
|
}
|
|
64472
64464
|
}
|
|
64473
64465
|
return projects;
|
|
64474
64466
|
}
|
|
64475
|
-
|
|
64467
|
+
function logError(error3, i18nText, logger) {
|
|
64468
|
+
const errorMessage = i18n_1.i18n.t(i18nText, {
|
|
64469
|
+
error: error3.message
|
|
64470
|
+
});
|
|
64471
|
+
if (logger) {
|
|
64472
|
+
logger.error(errorMessage);
|
|
64473
|
+
} else {
|
|
64474
|
+
console.error(errorMessage);
|
|
64475
|
+
}
|
|
64476
|
+
}
|
|
64477
|
+
async function findAllProjectRoots(wsFolders, sapuxRequired = true, logger, includeAdaptationProjects) {
|
|
64476
64478
|
const projects = await findAllPackageJsonFolders(wsFolders, logger);
|
|
64477
64479
|
if (sapuxRequired) {
|
|
64478
64480
|
const sapuxProjects = [];
|
|
64479
64481
|
for (const root of projects) {
|
|
64480
64482
|
try {
|
|
64481
|
-
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux) {
|
|
64483
|
+
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux || includeAdaptationProjects && await isAdaptationProject(root)) {
|
|
64482
64484
|
sapuxProjects.push(root);
|
|
64483
64485
|
}
|
|
64484
64486
|
} catch (error3) {
|
|
64485
|
-
|
|
64486
|
-
error: error3.message
|
|
64487
|
-
});
|
|
64488
|
-
if (logger) {
|
|
64489
|
-
logger.error(errorMessage);
|
|
64490
|
-
} else {
|
|
64491
|
-
console.error(errorMessage);
|
|
64492
|
-
}
|
|
64487
|
+
logError(error3, "ERROR_INVALID_PACKAGE_JSON", logger);
|
|
64493
64488
|
}
|
|
64494
64489
|
}
|
|
64495
64490
|
return sapuxProjects;
|
|
@@ -64634,14 +64629,7 @@ var require_utils10 = __commonJS({
|
|
|
64634
64629
|
result2.push(root);
|
|
64635
64630
|
}
|
|
64636
64631
|
} catch (error3) {
|
|
64637
|
-
|
|
64638
|
-
root
|
|
64639
|
-
});
|
|
64640
|
-
if (logger) {
|
|
64641
|
-
logger.error(errorMessage);
|
|
64642
|
-
} else {
|
|
64643
|
-
console.error(errorMessage);
|
|
64644
|
-
}
|
|
64632
|
+
logError(error3, "ERROR_INVALIND_PACKAGE_JSON_FOR_APP", logger);
|
|
64645
64633
|
}
|
|
64646
64634
|
}
|
|
64647
64635
|
return result2;
|
|
@@ -83391,12 +83379,16 @@ var require_toolsSuiteTelemetrySettings = __commonJS({
|
|
|
83391
83379
|
return path_1.default.join(homedir, settingsPath);
|
|
83392
83380
|
};
|
|
83393
83381
|
var setEnableTelemetry = async (enableTelemetry) => {
|
|
83394
|
-
|
|
83395
|
-
|
|
83396
|
-
|
|
83397
|
-
|
|
83398
|
-
|
|
83399
|
-
|
|
83382
|
+
try {
|
|
83383
|
+
const storeService = await (0, store_1.getService)({
|
|
83384
|
+
entityName: "telemetrySetting"
|
|
83385
|
+
});
|
|
83386
|
+
const setting = new store_1.TelemetrySetting({ enableTelemetry });
|
|
83387
|
+
await storeService.write(setting);
|
|
83388
|
+
system_1.TelemetrySystem.telemetryEnabled = enableTelemetry;
|
|
83389
|
+
} catch (e) {
|
|
83390
|
+
console.error(`Telemetry settings could not be written. Error : ${e.message}`);
|
|
83391
|
+
}
|
|
83400
83392
|
const commonProperties = await (0, toolsSuiteTelemetryDataProcessor_1.getCommonProperties)();
|
|
83401
83393
|
(0, reporting_1.reportEnableTelemetryOnOff)(enableTelemetry, commonProperties);
|
|
83402
83394
|
};
|
|
@@ -32278,7 +32278,7 @@ var require_ui5AbapRepository = __commonJS({
|
|
|
32278
32278
|
}
|
|
32279
32279
|
return isExisting ? await httpClient.put(`/Repositories('${encodeURIComponent(appName)}')`, payload, config2) : await httpClient.post("/Repositories", payload, config2);
|
|
32280
32280
|
} catch (error5) {
|
|
32281
|
-
if (((_a2 = error5 == null ? void 0 : error5.response) == null ? void 0 : _a2.status)
|
|
32281
|
+
if ([504, 408].includes((_a2 = error5 == null ? void 0 : error5.response) == null ? void 0 : _a2.status)) {
|
|
32282
32282
|
if (tryCount >= 3) {
|
|
32283
32283
|
throw error5;
|
|
32284
32284
|
}
|
|
@@ -53006,7 +53006,7 @@ var require_package5 = __commonJS({
|
|
|
53006
53006
|
"../lib/telemetry/dist/package.json"(exports2, module2) {
|
|
53007
53007
|
module2.exports = {
|
|
53008
53008
|
name: "@sap/ux-telemetry",
|
|
53009
|
-
version: "1.9.
|
|
53009
|
+
version: "1.9.7",
|
|
53010
53010
|
description: "SAP Fiori tools telemetry library",
|
|
53011
53011
|
main: "dist/src/index.js",
|
|
53012
53012
|
author: "SAP SE",
|
|
@@ -53031,10 +53031,10 @@ var require_package5 = __commonJS({
|
|
|
53031
53031
|
},
|
|
53032
53032
|
dependencies: {
|
|
53033
53033
|
"@sap-ux/store": "0.3.8",
|
|
53034
|
-
"@sap/ux-cds": "1.9.
|
|
53035
|
-
"@sap/ux-common-utils": "1.9.
|
|
53036
|
-
"@sap/ux-feature-toggle": "1.9.
|
|
53037
|
-
"@sap/ux-project-access": "1.9.
|
|
53034
|
+
"@sap/ux-cds": "1.9.7",
|
|
53035
|
+
"@sap/ux-common-utils": "1.9.7",
|
|
53036
|
+
"@sap/ux-feature-toggle": "1.9.7",
|
|
53037
|
+
"@sap/ux-project-access": "1.9.7",
|
|
53038
53038
|
applicationinsights: "1.4.1",
|
|
53039
53039
|
axios: "0.26.0",
|
|
53040
53040
|
"performance-now": "2.1.0",
|
|
@@ -53044,7 +53044,7 @@ var require_package5 = __commonJS({
|
|
|
53044
53044
|
memfs: "3.4.13",
|
|
53045
53045
|
"ts-jest": "29.0.5",
|
|
53046
53046
|
"ts-node": "8.5.2",
|
|
53047
|
-
typescript: "4.9.
|
|
53047
|
+
typescript: "4.9.5",
|
|
53048
53048
|
unionfs: "4.4.0"
|
|
53049
53049
|
},
|
|
53050
53050
|
files: [
|
|
@@ -63639,37 +63639,32 @@ var require_utils9 = __commonJS({
|
|
|
63639
63639
|
try {
|
|
63640
63640
|
await findProject(root, projects);
|
|
63641
63641
|
} catch (error5) {
|
|
63642
|
-
|
|
63643
|
-
root,
|
|
63644
|
-
error: error5.message
|
|
63645
|
-
});
|
|
63646
|
-
if (logger) {
|
|
63647
|
-
logger.error(errorMessage);
|
|
63648
|
-
} else {
|
|
63649
|
-
console.error(errorMessage);
|
|
63650
|
-
}
|
|
63642
|
+
logError(error5, "ERROR_PROJECT_ROOT_WORKSPACE", logger);
|
|
63651
63643
|
}
|
|
63652
63644
|
}
|
|
63653
63645
|
return projects;
|
|
63654
63646
|
}
|
|
63655
|
-
|
|
63647
|
+
function logError(error5, i18nText, logger) {
|
|
63648
|
+
const errorMessage = i18n_1.i18n.t(i18nText, {
|
|
63649
|
+
error: error5.message
|
|
63650
|
+
});
|
|
63651
|
+
if (logger) {
|
|
63652
|
+
logger.error(errorMessage);
|
|
63653
|
+
} else {
|
|
63654
|
+
console.error(errorMessage);
|
|
63655
|
+
}
|
|
63656
|
+
}
|
|
63657
|
+
async function findAllProjectRoots(wsFolders, sapuxRequired = true, logger, includeAdaptationProjects) {
|
|
63656
63658
|
const projects = await findAllPackageJsonFolders(wsFolders, logger);
|
|
63657
63659
|
if (sapuxRequired) {
|
|
63658
63660
|
const sapuxProjects = [];
|
|
63659
63661
|
for (const root of projects) {
|
|
63660
63662
|
try {
|
|
63661
|
-
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux) {
|
|
63663
|
+
if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux || includeAdaptationProjects && await isAdaptationProject(root)) {
|
|
63662
63664
|
sapuxProjects.push(root);
|
|
63663
63665
|
}
|
|
63664
63666
|
} catch (error5) {
|
|
63665
|
-
|
|
63666
|
-
error: error5.message
|
|
63667
|
-
});
|
|
63668
|
-
if (logger) {
|
|
63669
|
-
logger.error(errorMessage);
|
|
63670
|
-
} else {
|
|
63671
|
-
console.error(errorMessage);
|
|
63672
|
-
}
|
|
63667
|
+
logError(error5, "ERROR_INVALID_PACKAGE_JSON", logger);
|
|
63673
63668
|
}
|
|
63674
63669
|
}
|
|
63675
63670
|
return sapuxProjects;
|
|
@@ -63814,14 +63809,7 @@ var require_utils9 = __commonJS({
|
|
|
63814
63809
|
result2.push(root);
|
|
63815
63810
|
}
|
|
63816
63811
|
} catch (error5) {
|
|
63817
|
-
|
|
63818
|
-
root
|
|
63819
|
-
});
|
|
63820
|
-
if (logger) {
|
|
63821
|
-
logger.error(errorMessage);
|
|
63822
|
-
} else {
|
|
63823
|
-
console.error(errorMessage);
|
|
63824
|
-
}
|
|
63812
|
+
logError(error5, "ERROR_INVALIND_PACKAGE_JSON_FOR_APP", logger);
|
|
63825
63813
|
}
|
|
63826
63814
|
}
|
|
63827
63815
|
return result2;
|
|
@@ -82571,12 +82559,16 @@ var require_toolsSuiteTelemetrySettings = __commonJS({
|
|
|
82571
82559
|
return path_1.default.join(homedir, settingsPath);
|
|
82572
82560
|
};
|
|
82573
82561
|
var setEnableTelemetry = async (enableTelemetry) => {
|
|
82574
|
-
|
|
82575
|
-
|
|
82576
|
-
|
|
82577
|
-
|
|
82578
|
-
|
|
82579
|
-
|
|
82562
|
+
try {
|
|
82563
|
+
const storeService = await (0, store_1.getService)({
|
|
82564
|
+
entityName: "telemetrySetting"
|
|
82565
|
+
});
|
|
82566
|
+
const setting = new store_1.TelemetrySetting({ enableTelemetry });
|
|
82567
|
+
await storeService.write(setting);
|
|
82568
|
+
system_1.TelemetrySystem.telemetryEnabled = enableTelemetry;
|
|
82569
|
+
} catch (e) {
|
|
82570
|
+
console.error(`Telemetry settings could not be written. Error : ${e.message}`);
|
|
82571
|
+
}
|
|
82580
82572
|
const commonProperties = await (0, toolsSuiteTelemetryDataProcessor_1.getCommonProperties)();
|
|
82581
82573
|
(0, reporting_1.reportEnableTelemetryOnOff)(enableTelemetry, commonProperties);
|
|
82582
82574
|
};
|
|
@@ -104062,9 +104054,9 @@ var require_abap = __commonJS({
|
|
|
104062
104054
|
}
|
|
104063
104055
|
});
|
|
104064
104056
|
|
|
104065
|
-
// ../../node_modules/@sap-ux/
|
|
104057
|
+
// ../../node_modules/@sap-ux/btp-utils/dist/app-studio.env.js
|
|
104066
104058
|
var require_app_studio_env = __commonJS({
|
|
104067
|
-
"../../node_modules/@sap-ux/
|
|
104059
|
+
"../../node_modules/@sap-ux/btp-utils/dist/app-studio.env.js"(exports2) {
|
|
104068
104060
|
"use strict";
|
|
104069
104061
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
104070
104062
|
exports2.ENV = void 0;
|
|
@@ -104076,9 +104068,9 @@ var require_app_studio_env = __commonJS({
|
|
|
104076
104068
|
}
|
|
104077
104069
|
});
|
|
104078
104070
|
|
|
104079
|
-
// ../../node_modules/@sap-ux/
|
|
104071
|
+
// ../../node_modules/@sap-ux/btp-utils/dist/app-studio.js
|
|
104080
104072
|
var require_app_studio2 = __commonJS({
|
|
104081
|
-
"../../node_modules/@sap-ux/
|
|
104073
|
+
"../../node_modules/@sap-ux/btp-utils/dist/app-studio.js"(exports2) {
|
|
104082
104074
|
"use strict";
|
|
104083
104075
|
var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
|
|
104084
104076
|
function adopt(value) {
|
|
@@ -104168,9 +104160,9 @@ var require_app_studio2 = __commonJS({
|
|
|
104168
104160
|
}
|
|
104169
104161
|
});
|
|
104170
104162
|
|
|
104171
|
-
// ../../node_modules/@sap-ux/
|
|
104163
|
+
// ../../node_modules/@sap-ux/btp-utils/dist/destination.js
|
|
104172
104164
|
var require_destination2 = __commonJS({
|
|
104173
|
-
"../../node_modules/@sap-ux/
|
|
104165
|
+
"../../node_modules/@sap-ux/btp-utils/dist/destination.js"(exports2) {
|
|
104174
104166
|
"use strict";
|
|
104175
104167
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
104176
104168
|
exports2.isFullUrlDestination = exports2.isPartialUrlDestination = exports2.isGenericODataDestination = exports2.isAbapEnvironmentOnBtp = exports2.isAbapSystem = exports2.WebIDEAdditionalData = exports2.WebIDEUsage = void 0;
|
|
@@ -104214,17 +104206,17 @@ var require_destination2 = __commonJS({
|
|
|
104214
104206
|
}
|
|
104215
104207
|
});
|
|
104216
104208
|
|
|
104217
|
-
// ../../node_modules/@sap-ux/
|
|
104209
|
+
// ../../node_modules/@sap-ux/btp-utils/dist/service-info.js
|
|
104218
104210
|
var require_service_info = __commonJS({
|
|
104219
|
-
"../../node_modules/@sap-ux/
|
|
104211
|
+
"../../node_modules/@sap-ux/btp-utils/dist/service-info.js"(exports2) {
|
|
104220
104212
|
"use strict";
|
|
104221
104213
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
104222
104214
|
}
|
|
104223
104215
|
});
|
|
104224
104216
|
|
|
104225
|
-
// ../../node_modules/@sap-ux/
|
|
104217
|
+
// ../../node_modules/@sap-ux/btp-utils/dist/index.js
|
|
104226
104218
|
var require_dist18 = __commonJS({
|
|
104227
|
-
"../../node_modules/@sap-ux/
|
|
104219
|
+
"../../node_modules/@sap-ux/btp-utils/dist/index.js"(exports2) {
|
|
104228
104220
|
"use strict";
|
|
104229
104221
|
var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
|
|
104230
104222
|
if (k2 === void 0)
|