diff --git a/.changeset/light-books-kiss.md b/.changeset/light-books-kiss.md new file mode 100644 index 000000000..c8ff74f1d --- /dev/null +++ b/.changeset/light-books-kiss.md @@ -0,0 +1,6 @@ +--- +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +--- + +fix: correct SAPUI5 term diff --git a/examples/README.md b/examples/README.md index 70039a4da..0ee7d4313 100644 --- a/examples/README.md +++ b/examples/README.md @@ -4,4 +4,4 @@ This folder contains a collection of examples ## sap-ui5-web-server -A local web server to host SAP UI5 SDK +A local web server to host SAPUI5 SDK diff --git a/packages/constant/src/constant.ts b/packages/constant/src/constant.ts index a5cd55d18..6e5a6f901 100644 --- a/packages/constant/src/constant.ts +++ b/packages/constant/src/constant.ts @@ -2,9 +2,9 @@ export const OPEN_FRAMEWORK = "OpenUI5"; export const DEFAULT_UI5_FRAMEWORK = "SAPUI5"; //https://ui5.sap.com/version.json -export const DEFAULT_UI5_VERSION = "1.71.70"; +export const DEFAULT_UI5_VERSION = "1.71.72"; // https://sdk.openui5.org/version.json -export const DEFAULT_OPEN_UI5_VERSION = "1.71.67"; +export const DEFAULT_OPEN_UI5_VERSION = "1.71.68"; export const DEFAULT_UI5_VERSION_BASE = "1.71"; diff --git a/packages/logic-utils/test/unit/ui5.test.ts b/packages/logic-utils/test/unit/ui5.test.ts index 3337d9608..2c3ba7c6b 100644 --- a/packages/logic-utils/test/unit/ui5.test.ts +++ b/packages/logic-utils/test/unit/ui5.test.ts @@ -72,7 +72,7 @@ describe("getVersionInfoUrl", () => { DEFAULT_UI5_VERSION ); expect(result).toStrictEqual( - "https://ui5.sap.com/1.71.70/resources/sap-ui-version.json" + "https://ui5.sap.com/1.71.72/resources/sap-ui-version.json" ); }); it("get version info uri for OpenUI5", async () => { @@ -81,7 +81,7 @@ describe("getVersionInfoUrl", () => { DEFAULT_OPEN_UI5_VERSION ); expect(result).toStrictEqual( - "https://sdk.openui5.org/1.71.67/resources/sap-ui-version.json" + "https://sdk.openui5.org/1.71.68/resources/sap-ui-version.json" ); }); }); @@ -93,7 +93,7 @@ it("getLibraryAPIJsonUrl", async () => { "sap.m" ); expect(result).toStrictEqual( - "https://ui5.sap.com/1.71.70/test-resources/sap/m/designtime/api.json" + "https://ui5.sap.com/1.71.72/test-resources/sap/m/designtime/api.json" ); }); @@ -117,7 +117,7 @@ describe("getVersionsMap", () => { it("get version map for OpenUI5 - fallback default", async () => { const data = { latest: { - version: "1.71.67", + version: "1.71.68", support: "Maintenance", lts: true, }, diff --git a/packages/vscode-ui5-language-assistant/README.md b/packages/vscode-ui5-language-assistant/README.md index d779bcf56..89ca30150 100644 --- a/packages/vscode-ui5-language-assistant/README.md +++ b/packages/vscode-ui5-language-assistant/README.md @@ -210,7 +210,7 @@ When working with CAP projects, make sure you have @sap/cds module installed. Fo ### Enabling offline work -You can set up a local web server to host one or more supported versions of SAP UI5 SDK and register it in the user/workspace setting `"UI5LanguageAssistant.SAPUI5WebServer"`. This overrides the public CDN of SAP UI5 SDK in the extension and enables offline work with the apps having the matching hosted `"minUI5Version"` in `manifest.json`. +You can set up a local web server to host one or more supported versions of SAPUI5 SDK and register it in the user/workspace setting `"UI5LanguageAssistant.SAPUI5WebServer"`. This overrides the public CDN of SAPUI5 SDK in the extension and enables offline work with the apps having the matching hosted `"minUI5Version"` in `manifest.json`. When configuring local web server, make sure it responds to the exact UI5 version defined in manifest.json e.g `/1.111.0` **Note**: Once online, UI5 Language Assistant also caches required resources for offline usage and performance optimization. diff --git a/packages/vscode-ui5-language-assistant/src/extension.ts b/packages/vscode-ui5-language-assistant/src/extension.ts index 87cc0a11f..c2200752e 100644 --- a/packages/vscode-ui5-language-assistant/src/extension.ts +++ b/packages/vscode-ui5-language-assistant/src/extension.ts @@ -212,7 +212,7 @@ async function updateCurrentModel(model: UI5Model | undefined): Promise { if (response) { version = `${version} (local)`; tooltipText = - "Alternative (local) SAP UI5 web server is defined in user or workspace settings. Using SAP UI5 version fetched from the local server"; + "Alternative (local) SAPUI5 web server is defined in user or workspace settings. Using SAPUI5 version fetched from the local server"; } } statusBarItem.tooltip = tooltipText; @@ -234,7 +234,7 @@ function handleContextError(error: Error & { code?: string }) { showedOnce = true; if (error.code) { window.showErrorMessage( - "[SAP UI5 SDK](https://tools.hana.ondemand.com/#sapui5) is not accessible. Connect to the internet or setup local web server for offline work." + "[SAPUI5 SDK](https://tools.hana.ondemand.com/#sapui5) is not accessible. Connect to the internet or setup local web server for offline work." ); } else { window.showErrorMessage( diff --git a/test-packages/test-utils/src/utils/semantic-model-provider.ts b/test-packages/test-utils/src/utils/semantic-model-provider.ts index fa79cf9ed..4e041919d 100644 --- a/test-packages/test-utils/src/utils/semantic-model-provider.ts +++ b/test-packages/test-utils/src/utils/semantic-model-provider.ts @@ -14,7 +14,7 @@ const MODEL_CACHE: Record = Object.create(null); const fixes: Record = { - "1.71.70": { + "1.71.72": { array: "any[]", Array: "any[]", bloolean: undefined, @@ -258,7 +258,7 @@ type LibraryFix = (content: Json) => void; // Library version -> library name -> fix function const libraryFixes: Record> = { - "1.71.70": {}, + "1.71.72": {}, "1.84.41": {}, "1.96.27": { "sap.ui.mdc": [