Merge pull request #234 from jovotech/v4/development

🔖 Publish
jovotech · Aug 27, 2021 · 046c193 · 046c193
2 parents c232c1b + 557a587
commit 046c193
Show file tree

Hide file tree

Showing 34 changed files with 26,367 additions and 41,641 deletions.
diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/src/Collector.ts b/cli/src/Collector.ts
@@ -79,6 +79,8 @@ export class Collector extends Plugin {
  });
  }
  } catch (error) {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
  JovoCliError.print(error);
  process.exit(1);
  }

diff --git a/commands/command-build/package-lock.json b/commands/command-build/package-lock.json
diff --git a/commands/command-build/src/commands/build.ts b/commands/command-build/src/commands/build.ts
@@ -1,4 +1,4 @@
-import { DeployEvents } from '@jovotech/cli-command-deploy';
+import { DeployCodeEvents, DeployPlatformEvents } from '@jovotech/cli-command-deploy';
 import {
  checkForProjectDirectory,
  CliFlags,
@@ -32,7 +32,7 @@ export interface BuildContext extends PluginContext {
 
 export type BuildEvents = 'before.build' | 'build' | 'after.build' | 'reverse.build';
 
-export class Build extends PluginCommand<BuildEvents | DeployEvents> {
+export class Build extends PluginCommand<BuildEvents | DeployCodeEvents | DeployPlatformEvents> {
  static id = 'build';
  static description = 'Build platform-specific language models based on jovo models folder.';
  static examples: string[] = ['jovo build --platform alexaSkill', 'jovo build --target zip'];
@@ -160,9 +160,9 @@ export class Build extends PluginCommand<BuildEvents | DeployEvents> {
 
  if (flags.deploy) {
  Log.spacer();
- await this.$emitter.run('before.deploy');
- await this.$emitter.run('deploy');
- await this.$emitter.run('after.deploy');
+ await this.$emitter.run('before.deploy:platform');
+ await this.$emitter.run('deploy:platform');
+ await this.$emitter.run('after.deploy:platform');
  }
 
  Log.spacer();

diff --git a/commands/command-deploy/package-lock.json b/commands/command-deploy/package-lock.json
diff --git a/commands/command-deploy/src/commands/deploy.ts b/commands/command-deploy/src/commands/deploy.ts
diff --git a/commands/command-deploy/src/index.ts b/commands/command-deploy/src/index.ts
@@ -1,9 +1,7 @@
 import { JovoCliPlugin, PluginCommand, PluginType } from '@jovotech/cli-core';
-import { Deploy } from './commands/deploy';
 import { DeployCode } from './commands/deploy.code';
 import { DeployPlatform } from './commands/deploy.platform';
 
-export * from './commands/deploy';
 export * from './commands/deploy.code';
 export * from './commands/deploy.platform';
 
@@ -12,7 +10,7 @@ export class DeployCommand extends JovoCliPlugin {
  $type: PluginType = 'command';
 
  getCommands(): typeof PluginCommand[] {
- return [Deploy, DeployCode, DeployPlatform];
+ return [DeployCode, DeployPlatform];
  }
 }