Merge remote-tracking branch origin/next into private_routing_docs

infra-geo-ouverte · Mar 13, 2024 · 3e165db · 3e165db
2 parents 7853486 + 03b8848
commit 3e165db
Show file tree

Hide file tree

Showing 18 changed files with 196 additions and 183 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "igo",
-  "version": "16.3.0",
+  "version": "17.0.0-next.0",
   "description": "Infrastructure géomatique ouverte",
   "author": "Communauté IGO",
   "repository": {
@@ -55,13 +55,13 @@
     "@angular/platform-browser-dynamic": "^17.0.7",
     "@angular/router": "^17.0.7",
     "@angular/service-worker": "^17.0.7",
-    "@igo2/auth": "^17.0.0-next.0",
-    "@igo2/common": "^17.0.0-next.0",
-    "@igo2/context": "^17.0.0-next.0",
-    "@igo2/core": "^17.0.0-next.0",
-    "@igo2/geo": "^17.0.0-next.0",
-    "@igo2/integration": "^17.0.0-next.0",
-    "@igo2/utils": "^17.0.0-next.0",
+    "@igo2/auth": "^17.0.0-next.3",
+    "@igo2/common": "^17.0.0-next.3",
+    "@igo2/context": "^17.0.0-next.3",
+    "@igo2/core": "^17.0.0-next.3",
+    "@igo2/geo": "^17.0.0-next.3",
+    "@igo2/integration": "^17.0.0-next.3",
+    "@igo2/utils": "^17.0.0-next.3",
     "core-js": "^3.32.2",
     "hammerjs": "^2.0.8",
     "ol": "^7.5.2",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -3,9 +3,12 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { Meta, Title } from '@angular/platform-browser';
 import { NavigationEnd, Router } from '@angular/router';
 
-import { AuthFormComponent, AuthOptions } from '@igo2/auth';
+import { AuthOptions } from '@igo2/auth';
+import { AuthFormComponent } from '@igo2/auth/form';
 import { SpinnerComponent, StopPropagationDirective } from '@igo2/common';
-import { ConfigService, LanguageService, MessageService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { LanguageService } from '@igo2/core/language';
+import { MessageService } from '@igo2/core/message';
 import { AppOptions } from '@igo2/integration';
 import { DomUtils, userAgent } from '@igo2/utils';
 

diff --git a/src/app/app.utils.ts b/src/app/app.utils.ts
@@ -1,4 +1,4 @@
-import { ConfigService, version } from '@igo2/core';
+import { ConfigService, version } from '@igo2/core/config';
 
 export function getAppVersion(configService: ConfigService): string {
   return (

diff --git a/src/app/pages/footer/footer.component.ts b/src/app/pages/footer/footer.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { LanguageService } from '@igo2/core';
+import { LanguageService } from '@igo2/core/language';
 
 import { TranslateModule } from '@ngx-translate/core';
 

diff --git a/src/app/pages/header/header.component.ts b/src/app/pages/header/header.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
 import { MatToolbarModule } from '@angular/material/toolbar';
 
-import { ConfigService, LanguageService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { LanguageService } from '@igo2/core/language';
 
 import { TranslateModule } from '@ngx-translate/core';
 

diff --git a/...p/pages/portal/expansion-panel/expansion-panel-button/expansion-panel-button.component.ts b/...p/pages/portal/expansion-panel/expansion-panel-button/expansion-panel-button.component.ts
@@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import { IgoLanguageModule } from '@igo2/core';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 @Component({
   selector: 'app-expansion-panel-button',

diff --git a/src/app/pages/portal/map-overlay/map-overlay.component.ts b/src/app/pages/portal/map-overlay/map-overlay.component.ts
@@ -2,7 +2,8 @@ import { NgClass, NgFor, NgIf, NgStyle } from '@angular/common';
 import { AfterViewInit, Component, OnDestroy } from '@angular/core';
 
 import { Context, ContextService } from '@igo2/context';
-import { ConfigService, MediaService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { MediaService } from '@igo2/core/media';
 
 import { Subscription } from 'rxjs';
 

diff --git a/src/app/pages/portal/map-overlay/map-overlay.interface.ts b/src/app/pages/portal/map-overlay/map-overlay.interface.ts
@@ -1,4 +1,4 @@
-import { Media } from '@igo2/core';
+import { Media } from '@igo2/core/media';
 
 import { MapOverlayCssClass } from './map-overlay.enum';
 

diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
@@ -46,15 +46,11 @@ import {
   MapContextDirective,
   UserButtonComponent
 } from '@igo2/context';
-import {
-  ConfigService,
-  LanguageService,
-  Media,
-  MediaOrientation,
-  MediaService,
-  MessageService,
-  StorageService
-} from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { LanguageService } from '@igo2/core/language';
+import { Media, MediaOrientation, MediaService } from '@igo2/core/media';
+import { MessageService } from '@igo2/core/message';
+import { StorageService } from '@igo2/core/storage';
 import {
   CapabilitiesService,
   ConfigFileToGeoDBService,

diff --git a/src/app/pages/portal/portal.module.ts b/src/app/pages/portal/portal.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 
-import { IgoGestureModule } from '@igo2/core';
+import { IgoGestureModule } from '@igo2/core/gesture';
 import {
   IgoDirectionsModule,
   IgoQueryModule,

diff --git a/src/app/pages/portal/sidenav/sidenav.component.ts b/src/app/pages/portal/sidenav/sidenav.component.ts
@@ -21,7 +21,7 @@ import {
   Toolbox,
   ToolboxComponent
 } from '@igo2/common';
-import { ConfigService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
 import { IgoMap } from '@igo2/geo';
 import { CatalogState, ToolState } from '@igo2/integration';
 

diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.ts b/src/app/pages/portal/toast-panel/toast-panel.component.ts
@@ -25,15 +25,14 @@ import {
   StopPropagationDirective,
   getEntityTitle
 } from '@igo2/common';
+import { ConfigService } from '@igo2/core/config';
+import { LanguageService } from '@igo2/core/language';
+import { Media, MediaService } from '@igo2/core/media';
 import {
-  ConfigService,
-  LanguageService,
-  Media,
-  MediaService,
   StorageScope,
   StorageService,
   StorageServiceEvent
-} from '@igo2/core';
+} from '@igo2/core/storage';
 import {
   Feature,
   FeatureDetailsComponent,

diff --git a/src/app/pages/portal/welcome-window/welcome-window.component.ts b/src/app/pages/portal/welcome-window/welcome-window.component.ts
@@ -10,7 +10,8 @@ import {
 import { MatToolbarModule } from '@angular/material/toolbar';
 
 import { CustomHtmlComponent, IgoInteractiveTourModule } from '@igo2/common';
-import { ConfigService, LanguageService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { LanguageService } from '@igo2/core/language';
 
 import { TranslateModule } from '@ngx-translate/core';
 import { BehaviorSubject, Observable, Subscription, of } from 'rxjs';
@@ -19,6 +20,8 @@ import { getAppVersion } from 'src/app/app.utils';
 
 import { WelcomeWindowService } from './welcome-window.service';
 
+('@igo2/core');
+
 @Component({
   selector: 'app-welcome-window',
   templateUrl: './welcome-window.component.html',

diff --git a/src/app/pages/portal/welcome-window/welcome-window.service.ts b/src/app/pages/portal/welcome-window/welcome-window.service.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
 import { MatDialogConfig } from '@angular/material/dialog';
 
-import { ConfigService, StorageService } from '@igo2/core';
+import { ConfigService } from '@igo2/core/config';
+import { StorageService } from '@igo2/core/storage';
 
 import { getAppVersion } from 'src/app/app.utils';
 

diff --git a/src/app/services/pwa.service.ts b/src/app/services/pwa.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { SwUpdate } from '@angular/service-worker';
 
 import { ConfirmDialogService } from '@igo2/common';
-import { LanguageService } from '@igo2/core';
+import { LanguageService } from '@igo2/core/language';
 
 import { interval } from 'rxjs';
 import { skip, tap } from 'rxjs/operators';

diff --git a/src/environments/version.ts b/src/environments/version.ts
@@ -3,7 +3,7 @@
  * DO NOT EDIT THE APP VERSION OR RELEASE DATE
  * IF YOU CHANGE ANY KEY NAME BE SURE TO REFLECT THIS CHANGE IN OUR AUTOMATION SCRIPT
  */
-import { Version, version as libVersion } from '@igo2/core';
+import { Version, version as libVersion } from '@igo2/core/config';
 
 export const version: Version = {
   ...libVersion,

diff --git a/src/main.ts b/src/main.ts
@@ -16,15 +16,12 @@ import { provideAnimations } from '@angular/platform-browser/animations';
 import { provideRouter } from '@angular/router';
 import { ServiceWorkerModule } from '@angular/service-worker';
 
-import { IgoAuthModule } from '@igo2/auth';
-import {
-  ConfigService,
-  IgoCoreModule,
-  IgoMessageModule,
-  RouteService,
-  provideConfigOptions,
-  provideRootTranslation
-} from '@igo2/core';
+import { IgoAuthFormModule } from '@igo2/auth/form';
+import { IgoCoreModule } from '@igo2/core';
+import { ConfigService, provideConfigOptions } from '@igo2/core/config';
+import { provideRootTranslation } from '@igo2/core/language';
+import { IgoMessageModule } from '@igo2/core/message';
+import { RouteService } from '@igo2/core/route';
 import { loadTheme } from '@igo2/utils';
 
 import 'hammerjs';
@@ -51,7 +48,7 @@ bootstrapApplication(AppComponent, {
     importProvidersFrom(
       BrowserModule,
       IgoCoreModule.forRoot(),
-      IgoAuthModule.forRoot(),
+      IgoAuthFormModule.forRoot(),
       IgoMessageModule,
       PortalModule,
       ServiceWorkerModule.register('ngsw-worker.js', {