Merge pull request #1581 from jovotech/v4/dev

🔖 Prepare latest release
jovotech · Aug 8, 2023 · 86d6dc8 · 86d6dc8
2 parents 09516e3 + 174e807
commit 86d6dc8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/platforms/platform-alexa/src/cli/hooks/BuildHook.ts b/platforms/platform-alexa/src/cli/hooks/BuildHook.ts
@@ -453,10 +453,12 @@ export class BuildHook extends AlexaHook<BuildPlatformEvents> {
     const privacyAndCompliances = _get(
       projectFiles,
       `skill-package/["skill.json"].manifest.privacyAndCompliance.locales`,
+      {},
     ) as FileObject;
     const publishingInfos = _get(
       projectFiles,
       `skill-package/["skill.json"].manifest.publishingInformation.locales`,
+      {},
     ) as FileObject;
 
     for (const locale of locales) {

diff --git a/platforms/platform-alexa/src/cli/interfaces.ts b/platforms/platform-alexa/src/cli/interfaces.ts
@@ -98,7 +98,7 @@ export interface ImportStatus {
 
 export interface ImportResponse {
   body: UnknownObject;
-  headers: { key: string; value: string }[];
+  headers: {[key: string]: string};
 }
 
 export interface SkillStatusError {

diff --git a/platforms/platform-alexa/src/cli/smapi/SkillPackageManagement.ts b/platforms/platform-alexa/src/cli/smapi/SkillPackageManagement.ts
@@ -94,9 +94,5 @@ export async function getImportStatus(
 }
 
 function parseImportUrl({ headers }: ImportResponse): string | undefined {
-  // Try to parse the import url from command result
-  return headers
-    .find((header) => header.key === 'location')
-    ?.value.split('/')
-    .pop();
+  return headers['location']?.split('/').pop();
 }
diff --git a/platforms/platform-alexa/src/cli/utilities.ts b/platforms/platform-alexa/src/cli/utilities.ts
@@ -21,10 +21,11 @@ import { AskSkillChoice, AskSkillList } from './interfaces';
 export async function checkForAskCli(): Promise<void> {
   try {
     const { stdout } = await execAsync('ask --version');
-    const majorVersion: string = stdout![0];
-    if (parseInt(majorVersion) < 2) {
+    const majorVersion: number = parseInt(stdout![0]);
+    const minorVersion: number = parseInt(stdout!.slice(2, 4));
+    if (majorVersion < 2 || (majorVersion == 2 && minorVersion < 30)) {
       throw new JovoCliError({
-        message: 'Jovo CLI requires ASK CLI @v2 or above.',
+        message: 'Jovo CLI requires ASK CLI @v2.30.0 or above.',
         module: 'AlexaCli',
         hint: 'Please update your ASK CLI using "npm install ask-cli -g".',
       });