From a6dd135767a1727840e3b8fee4af63761186ca8b Mon Sep 17 00:00:00 2001 From: I743583 Date: Thu, 27 Feb 2025 10:38:01 +0000 Subject: [PATCH 1/5] Export Utility Functions for TLS Patching, Manifest Version Retrieval, and UI5 Version Info --- packages/axios-extension/src/index.ts | 1 + packages/ui5-application-writer/src/data/defaults.ts | 2 +- packages/ui5-application-writer/src/index.ts | 1 + packages/ui5-info/src/constants.ts | 3 ++- packages/ui5-info/src/index.ts | 4 +++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/axios-extension/src/index.ts b/packages/axios-extension/src/index.ts index e4aec8b3d2..12db2e5856 100644 --- a/packages/axios-extension/src/index.ts +++ b/packages/axios-extension/src/index.ts @@ -2,6 +2,7 @@ import type { AxiosError, AxiosRequestConfig } from 'axios'; import { isAxiosError } from './base/odata-request-error'; export * from './base/odata-service'; export * from './base/service-provider'; +export * from './base/patchTls'; export * from './abap'; export * from './factory'; export * from './auth'; diff --git a/packages/ui5-application-writer/src/data/defaults.ts b/packages/ui5-application-writer/src/data/defaults.ts index 20c8590ee7..4e5a52a08f 100644 --- a/packages/ui5-application-writer/src/data/defaults.ts +++ b/packages/ui5-application-writer/src/data/defaults.ts @@ -121,7 +121,7 @@ function getMinUI5Version(ui5Version: string, minUI5Version?: string) { * @param manifestVersion - optional manifest descriptor version to be used if provided * @returns - the manifest descriptor version */ -function getManifestVersion(ui5Version: string, manifestVersion?: string): string { +export function getManifestVersion(ui5Version: string, manifestVersion?: string): string { const ui5SemVer = semVer.coerce(ui5Version) as SemVer; /** diff --git a/packages/ui5-application-writer/src/index.ts b/packages/ui5-application-writer/src/index.ts index c59855e882..9d29477055 100644 --- a/packages/ui5-application-writer/src/index.ts +++ b/packages/ui5-application-writer/src/index.ts @@ -160,3 +160,4 @@ export { processDestinationPath, getTemplateVersionPath } from './utils'; +export { getManifestVersion } from './data/defaults'; diff --git a/packages/ui5-info/src/constants.ts b/packages/ui5-info/src/constants.ts index 9b757c752e..85c209226d 100644 --- a/packages/ui5-info/src/constants.ts +++ b/packages/ui5-info/src/constants.ts @@ -18,7 +18,8 @@ export const ui5VersionRequestInfo = { OfficialUrl: 'https://ui5.sap.com', NeoAppFile: 'neo-app.json', VersionsFile: 'version.json?sap-ui-config-patches=true&sap-ui-config-showall=true', - VersionExternalFile: 'version.json' + VersionExternalFile: 'version.json', + SnapshotUrl:'https://sapui5preview-sapui5.dispatcher.int.sap.eu2.hana.ondemand.com' }; export const defaultMinUi5Version = '1.65.0'; diff --git a/packages/ui5-info/src/index.ts b/packages/ui5-info/src/index.ts index edf47d7291..a7222a8458 100644 --- a/packages/ui5-info/src/index.ts +++ b/packages/ui5-info/src/index.ts @@ -3,7 +3,9 @@ export { minUi5VersionSupportingCodeAssist, minUi5VersionV4Template, minUI5VersionForLocalDev, - latestVersionString + latestVersionString, + ui5VersionRequestInfo, + defaultMinUi5Version } from './constants'; export type { UI5Theme, UI5Version, UI5VersionFilterOptions } from './types'; export { getUI5Versions, getLatestUI5Version } from './ui5-version-info'; From 99d0248f4c4cad8a46073237d83b2a1809c11fb9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 27 Feb 2025 11:04:45 +0000 Subject: [PATCH 2/5] Linting auto fix commit --- packages/ui5-info/src/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui5-info/src/constants.ts b/packages/ui5-info/src/constants.ts index 85c209226d..6f14829820 100644 --- a/packages/ui5-info/src/constants.ts +++ b/packages/ui5-info/src/constants.ts @@ -19,7 +19,7 @@ export const ui5VersionRequestInfo = { NeoAppFile: 'neo-app.json', VersionsFile: 'version.json?sap-ui-config-patches=true&sap-ui-config-showall=true', VersionExternalFile: 'version.json', - SnapshotUrl:'https://sapui5preview-sapui5.dispatcher.int.sap.eu2.hana.ondemand.com' + SnapshotUrl: 'https://sapui5preview-sapui5.dispatcher.int.sap.eu2.hana.ondemand.com' }; export const defaultMinUi5Version = '1.65.0'; From 4aeb91e346a810364b253a7109b060f08541f02a Mon Sep 17 00:00:00 2001 From: I743583 Date: Thu, 27 Feb 2025 11:10:43 +0000 Subject: [PATCH 3/5] add changeset --- .changeset/silent-cups-deny.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/silent-cups-deny.md diff --git a/.changeset/silent-cups-deny.md b/.changeset/silent-cups-deny.md new file mode 100644 index 0000000000..a4b0094686 --- /dev/null +++ b/.changeset/silent-cups-deny.md @@ -0,0 +1,7 @@ +--- +'@sap-ux/ui5-application-writer': minor +'@sap-ux/axios-extension': minor +'@sap-ux/ui5-info': minor +--- + +Export functions for TLS Patching, Manifest Version Retrieval, and UI5 Version Info From a4883bd186867f9b60889fe6fe740af9d8ce1dd3 Mon Sep 17 00:00:00 2001 From: I743583 Date: Thu, 27 Feb 2025 11:16:30 +0000 Subject: [PATCH 4/5] add changeset --- .changeset/dull-coins-sniff.md | 6 ++++++ .changeset/silent-cups-deny.md | 7 ------- packages/axios-extension/src/index.ts | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 .changeset/dull-coins-sniff.md delete mode 100644 .changeset/silent-cups-deny.md diff --git a/.changeset/dull-coins-sniff.md b/.changeset/dull-coins-sniff.md new file mode 100644 index 0000000000..ae7097c885 --- /dev/null +++ b/.changeset/dull-coins-sniff.md @@ -0,0 +1,6 @@ +--- +'@sap-ux/ui5-application-writer': minor +'@sap-ux/ui5-info': minor +--- + +Export functions for Manifest Version Retrieval, and UI5 Version Info diff --git a/.changeset/silent-cups-deny.md b/.changeset/silent-cups-deny.md deleted file mode 100644 index a4b0094686..0000000000 --- a/.changeset/silent-cups-deny.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@sap-ux/ui5-application-writer': minor -'@sap-ux/axios-extension': minor -'@sap-ux/ui5-info': minor ---- - -Export functions for TLS Patching, Manifest Version Retrieval, and UI5 Version Info diff --git a/packages/axios-extension/src/index.ts b/packages/axios-extension/src/index.ts index 12db2e5856..e4aec8b3d2 100644 --- a/packages/axios-extension/src/index.ts +++ b/packages/axios-extension/src/index.ts @@ -2,7 +2,6 @@ import type { AxiosError, AxiosRequestConfig } from 'axios'; import { isAxiosError } from './base/odata-request-error'; export * from './base/odata-service'; export * from './base/service-provider'; -export * from './base/patchTls'; export * from './abap'; export * from './factory'; export * from './auth'; From c52389978c8b829f0d1a0ee732c706ae4c53819c Mon Sep 17 00:00:00 2001 From: I743583 Date: Thu, 27 Feb 2025 14:52:51 +0000 Subject: [PATCH 5/5] remove snapshot url refernce from ui5VersionRequestInfo --- packages/ui5-info/src/constants.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/ui5-info/src/constants.ts b/packages/ui5-info/src/constants.ts index 6f14829820..9b757c752e 100644 --- a/packages/ui5-info/src/constants.ts +++ b/packages/ui5-info/src/constants.ts @@ -18,8 +18,7 @@ export const ui5VersionRequestInfo = { OfficialUrl: 'https://ui5.sap.com', NeoAppFile: 'neo-app.json', VersionsFile: 'version.json?sap-ui-config-patches=true&sap-ui-config-showall=true', - VersionExternalFile: 'version.json', - SnapshotUrl: 'https://sapui5preview-sapui5.dispatcher.int.sap.eu2.hana.ondemand.com' + VersionExternalFile: 'version.json' }; export const defaultMinUi5Version = '1.65.0';