From 2f5bc8b2ee1e1dbd80c199189ffe9ddb6242c18a Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Mon, 20 Oct 2025 13:44:20 +0200 Subject: [PATCH] update import paths and enhance development commands for shared-meet-components --- meet-ce/frontend/src/app/app.config.ts | 21 ++++++++++++++------- meet-ce/frontend/src/app/app.routes.ts | 2 +- meet.sh | 24 ++++++++++++++++-------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/meet-ce/frontend/src/app/app.config.ts b/meet-ce/frontend/src/app/app.config.ts index f8a0186..b9c38ff 100644 --- a/meet-ce/frontend/src/app/app.config.ts +++ b/meet-ce/frontend/src/app/app.config.ts @@ -1,13 +1,17 @@ import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper'; import { provideHttpClient, withInterceptors } from '@angular/common/http'; -import { ApplicationConfig, importProvidersFrom, provideZoneChangeDetection, inject, provideAppInitializer } from '@angular/core'; +import { + ApplicationConfig, + importProvidersFrom, + provideZoneChangeDetection, + inject, + provideAppInitializer +} from '@angular/core'; import { provideAnimationsAsync } from '@angular/platform-browser/animations/async'; import { provideRouter } from '@angular/router'; import { routes } from '@app/app.routes'; import { environment } from '@environment/environment'; -import { httpInterceptor } from '@openvidu-meet/shared/interceptors'; -import { CustomParticipantModel } from '@openvidu-meet/shared/models'; -import { ThemeService } from '@openvidu-meet/shared/services'; +import { CustomParticipantModel, httpInterceptor, ThemeService } from '@openvidu-meet/shared-components'; import { OpenViduComponentsConfig, OpenViduComponentsModule, ParticipantProperties } from 'openvidu-components-angular'; const ovComponentsconfig: OpenViduComponentsConfig = { @@ -18,9 +22,12 @@ const ovComponentsconfig: OpenViduComponentsConfig = { export const appConfig: ApplicationConfig = { providers: [ provideAppInitializer(() => { - const initializerFn = ((themeService: ThemeService) => () => themeService.initializeTheme())(inject(ThemeService)); - return initializerFn(); - }), + const initializerFn = ( + (themeService: ThemeService) => () => + themeService.initializeTheme() + )(inject(ThemeService)); + return initializerFn(); + }), importProvidersFrom(OpenViduComponentsModule.forRoot(ovComponentsconfig)), provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), diff --git a/meet-ce/frontend/src/app/app.routes.ts b/meet-ce/frontend/src/app/app.routes.ts index 938b685..79bd78e 100644 --- a/meet-ce/frontend/src/app/app.routes.ts +++ b/meet-ce/frontend/src/app/app.routes.ts @@ -1,4 +1,4 @@ import { Routes } from '@angular/router'; -import { baseRoutes } from '@openvidu-meet/shared/routes/base-routes'; +import { baseRoutes } from '@openvidu-meet/shared-components'; export const routes: Routes = baseRoutes; diff --git a/meet.sh b/meet.sh index 1b32b92..166514a 100755 --- a/meet.sh +++ b/meet.sh @@ -357,8 +357,6 @@ select_edition() { # Helper: Add common commands (components, typings, docs) add_common_dev_commands() { - local components_path="$1" - # Components watcher CMD_NAMES+=("components") CMD_COLORS+=("red") @@ -368,21 +366,27 @@ add_common_dev_commands() { CMD_NAMES+=("typings") CMD_COLORS+=("green") CMD_COMMANDS+=("./scripts/dev/watch-typings.sh") + + # shared-meet-components watcher + CMD_NAMES+=("shared-meet-components") + CMD_COLORS+=("yellow") + CMD_COMMANDS+=("pnpm --filter @openvidu-meet/frontend run lib:serve") } # Helper: Add CE-specific commands (backend, frontend) add_ce_commands() { local components_path="$1" + local shared_meet_components_path="$2" # Run backend CMD_NAMES+=("backend") CMD_COLORS+=("cyan") CMD_COMMANDS+=("node ./scripts/dev/watch-with-typings-guard.mjs 'pnpm run dev:backend'") - # Run frontend after components are ready + # Run frontend after components-angular and shared-meet-components are ready CMD_NAMES+=("frontend") CMD_COLORS+=("magenta") - CMD_COMMANDS+=("wait-on ${components_path} && sleep 1 && node ./scripts/dev/watch-with-typings-guard.mjs 'pnpm run dev:frontend'") + CMD_COMMANDS+=("wait-on ${components_path} && wait-on ${shared_meet_components_path} && sleep 1 && node ./scripts/dev/watch-with-typings-guard.mjs 'pnpm run dev:frontend'") } # Helper: Add PRO-specific commands (backend-pro, backend-ce-watch, frontend-pro) @@ -459,9 +463,12 @@ launch_dev_watchers() { echo -e "${BLUE}Processes: ${#CMD_NAMES[@]}${NC}" echo - # Clean up components package.json to ensure fresh install + # Clean up components package.json to ensure wait-on works rm -rf "${components_path}" + # Clean up shared-meet-components package.json to ensure wait-on works + rm -rf "${shared_meet_components_path}" + # Build concurrently arguments from arrays local names_arg=$(IFS=,; echo "${CMD_NAMES[*]}") local colors_arg=$(IFS=,; echo "${CMD_COLORS[*]}") @@ -489,6 +496,7 @@ dev() { # Define paths local components_path="../openvidu/openvidu-components-angular/dist/openvidu-components-angular/package.json" + local shared_meet_components_path="meet-ce/frontend/projects/shared-meet-components/dist/package.json" local browsersync_path # Initialize command arrays @@ -496,8 +504,8 @@ dev() { CMD_COLORS=() CMD_COMMANDS=() - # Add common commands (components, typings) - add_common_dev_commands "$components_path" + # Add common commands (components-angular, typings, shared-meet-components) + add_common_dev_commands # Add edition-specific commands and set paths if [ "$edition" = "pro" ]; then @@ -505,7 +513,7 @@ dev() { add_pro_commands "$components_path" else browsersync_path="meet-ce/backend/public/**/*" - add_ce_commands "$components_path" + add_ce_commands "$components_path" "$shared_meet_components_path" fi # Add docs and browser-sync commands