infra-geo-ouverte · mbarbeau · Mar 31, 2020 · Nov 29, 2019 · Nov 29, 2019 · Jan 17, 2020
diff --git a/packages/auth/ng-package.json b/packages/auth/ng-package.json
@@ -3,7 +3,12 @@
   "dest": "../../dist/auth",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/core" : "core",
+      "@igo2/utils" : "utils",
+      "jwt-decode" : "jwt"
+    }
   },
   "whitelistedNonPeerDependencies": ["jwt-decode"]
 }
diff --git a/packages/auth/ng-package.prod.json b/packages/auth/ng-package.prod.json
@@ -2,7 +2,12 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/auth",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/core" : "core",
+      "@igo2/utils" : "utils",
+      "jwt-decode" : "jwt"
+    }
   },
   "whitelistedNonPeerDependencies": ["jwt-decode"]
 }
diff --git a/packages/common/ng-package.json b/packages/common/ng-package.json
@@ -3,6 +3,12 @@
   "dest": "../../dist/common",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/core" : "core",
+      "@igo2/utils" : "utils",
+      "scroll-into-view-if-needed" : "scrollIntoView",
+      "typy" : "typy"
+    }
   }
 }
diff --git a/packages/common/ng-package.prod.json b/packages/common/ng-package.prod.json
@@ -2,6 +2,12 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/common",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/core" : "core",
+      "@igo2/utils" : "utils",
+      "scroll-into-view-if-needed" : "scrollIntoView",
+      "typy" : "typy"
+    }
   }
 }
diff --git a/packages/common/src/lib/entity/shared/view.ts b/packages/common/src/lib/entity/shared/view.ts
@@ -260,10 +260,10 @@ export class EntityView<E extends object, V extends object = E> {
    */
   private liftJoinedSource(): Observable<V[]> {
     const sources$ = [this.source$, combineLatest(
-      ...this.joins.map((join: EntityJoinClause) => join.source)
+      this.joins.map((join: EntityJoinClause) => join.source)
     )];
 
-    return combineLatest(...sources$)
+    return combineLatest(sources$)
       .pipe(
         map((bunch: [E[], any[]]) => {
           const [entities, joinData] = bunch;

diff --git a/packages/context/ng-package.json b/packages/context/ng-package.json
@@ -3,6 +3,17 @@
   "dest": "../../dist/context",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "ol/proj" : "olproj",
+      "ol/easing" : "oleasing",
+      "ol/geom/Point" : "olPoint",
+      "@igo2/utils" : "utils",
+      "@igo2/auth" : "auth",
+      "@igo2/core" : "core",
+      "@igo2/common" : "common",
+      "@igo2/geo" : "geo",
+      "ol/format/GeoJSON" : "olFormatGeoJSON"
+    }
   }
 }
diff --git a/packages/context/ng-package.prod.json b/packages/context/ng-package.prod.json
@@ -2,7 +2,18 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/context",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "ol/proj" : "olproj",
+      "ol/easing" : "oleasing",
+      "ol/geom/Point" : "olPoint",
+      "@igo2/utils" : "utils",
+      "@igo2/auth" : "auth",
+      "@igo2/core" : "core",
+      "@igo2/common" : "common",
+      "@igo2/geo" : "geo",
+      "ol/format/GeoJSON" : "olFormatGeoJSON"
+    }
   },
   "whitelistedNonPeerDependencies": ["ts-md5"]
 }
diff --git a/packages/core/ng-package.json b/packages/core/ng-package.json
@@ -3,7 +3,12 @@
   "dest": "../../dist/core",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/utils" : "utils",
+      "angular2-notifications" : "ng2notify",
+      "@ngx-translate/core" : "ngxt-core"
+    }
   },
   "whitelistedNonPeerDependencies": ["@ngx-translate", "angular2-notifications"]
 }
diff --git a/packages/core/ng-package.prod.json b/packages/core/ng-package.prod.json
@@ -2,7 +2,12 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/core",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/utils" : "utils",
+      "angular2-notifications" : "ng2notify",
+      "@ngx-translate/core" : "ngxt-core"
+    }
   },
   "whitelistedNonPeerDependencies": ["@ngx-translate", "angular2-notifications"]
 }
diff --git a/packages/core/src/lib/language/shared/language.loader.ts b/packages/core/src/lib/language/shared/language.loader.ts
@@ -33,7 +33,7 @@ export class LanguageLoader implements TranslateLoader {
 
     const appLocale$ = this.http.get(`${this.prefix}${lang}${this.suffix}`);
 
-    const locale$ = combineLatest(igoLocale$, appLocale$);
+    const locale$ = combineLatest([igoLocale$, appLocale$]);
 
     return locale$.pipe(
       map(translations => {

diff --git a/packages/geo/ng-package.json b/packages/geo/ng-package.json
@@ -3,7 +3,83 @@
   "dest": "../../dist/geo",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "ol-mapbox-style/stylefunction" : "stylefunction",
+      "ol/source/OSM" : "olSourceOSM",
+      "ol/source/XYZ" : "olSourceXYZ",
+      "ol/format/filter" : "olfilter",
+      "ol/format/WFS" : "olFormatWFS",
+      "ol/format/GML32" : "olFormatGML32",
+      "ol/format/OSMXML" : "olFormatOSMXML",
+      "ol/source/ImageWMS" : "olSourceImageWMS",
+      "ol/source/WMTS" : "olSourceWMTS",
+      "ol/tilegrid/WMTS" : "olTileGridWMTS",
+      "ol/extent.js" : "extent_js",
+      "ol/source/CartoDB" : "olSourceCarto",
+      "ol/loadingstrategy" : "OlLoadingStrategy",
+      "ol/source/TileArcGISRest" : "olSourceTileArcGISRest",
+      "ts-md5" : "tsMd5",
+      "ol/source/VectorTile" : "olSourceVectorTile",
+      "ol/format/MVT" : "olFormatMVT",
+      "ol/source/Cluster" : "olSourceCluster",
+      "ngx-cacheable" : "ngxCacheable",
+      "ol/source/WMTS.js" : "WMTS_js",
+      "ol/Map" : "olMap",
+      "ol/View" : "olView",
+      "ol/Geolocation" : "olGeolocation",
+      "ol/control/Attribution" : "olAttribution",
+      "ol/control/ScaleLine" : "olControlScaleLine",
+      "ol/geom/Circle" : "olCircle",
+      "ol/layer/Image" : "olLayerImage",
+      "ol/layer/Tile" : "olLayerTile",
+      "ol/color" : "color",
+      "ol/layer/VectorTile" : "olLayerVectorTile",
+      "ol/easing" : "oleasing",
+      "ol/has" : "has",
+      "proj4" : "proj4",
+      "ol/proj/proj4" : "olproj4",
+      "ol/format/GML2" : "olFormatGML2",
+      "ol/format/GML3" : "olFormatGML3",
+      "ol/format/EsriJSON" : "olFormatEsriJSON",
+      "ol/proj/Projection" : "olProjection",
+      "@mat-datetimepicker/core" : "datepickercore",
+      "ol/geom/Point" : "OlPoint",
+      "ol/Overlay" : "OlOverlay",
+      "ol/sphere" : "sphere",
+      "ol/style/Style" : "OlStyle",
+      "ol/geom/LineString" : "OlLineString",
+      "@turf/line-intersect" : "lineIntersect",
+      "@turf/helpers" : "helpers",
+      "ol/interaction/Modify" : "OlModify",
+      "ol/interaction/Translate" : "OlTranslate",
+      "ol/interaction/Draw" : "OlDraw",
+      "ol/geom/Polygon" : "OlPolygon",
+      "ol/geom/LinearRing" : "OlLinearRing",
+      "ol/interaction/DragBox" : "OlDragBoxInteraction",
+      "ol/source/Vector" : "OlVectorSource",
+      "ol/layer/Vector" : "OlVectorLayer",
+      "moment" : "moment",
+      "ol/format/WKT" : "olWKT",
+      "file-saver" : "fileSaver",
+      "jspdf" : "jsPDF",
+      "html2canvas" : "_html2canvas",
+      "jszip" : "JSZip",
+      "ol/Feature" : "olFeature",
+      "ol/geom" : "olgeom",
+      "ol/proj" : "olproj",
+      "ol/style" : "olstyle",
+      "ol/events/condition" : "olcondition",
+      "ol/interaction" : "olinteraction",
+      "ol/extent" : "olextent",
+      "ol/Observable" : "olobservable",
+      "@igo2/auth" : "auth",
+      "ol/format/GeoJSON" : "OlGeoJSON",
+      "@igo2/common" : "common",
+      "ol/format" : "olformat",
+      "@igo2/utils" : "utils",
+      "@igo2/core" : "core"
+    }
   },
   "whitelistedNonPeerDependencies": [
     "ts-md5",

diff --git a/packages/geo/ng-package.prod.json b/packages/geo/ng-package.prod.json
@@ -2,7 +2,83 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/geo",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "ol-mapbox-style/stylefunction" : "stylefunction",
+      "ol/source/OSM" : "olSourceOSM",
+      "ol/source/XYZ" : "olSourceXYZ",
+      "ol/format/filter" : "olfilter",
+      "ol/format/WFS" : "olFormatWFS",
+      "ol/format/GML32" : "olFormatGML32",
+      "ol/format/OSMXML" : "olFormatOSMXML",
+      "ol/source/ImageWMS" : "olSourceImageWMS",
+      "ol/source/WMTS" : "olSourceWMTS",
+      "ol/tilegrid/WMTS" : "olTileGridWMTS",
+      "ol/extent.js" : "extent_js",
+      "ol/source/CartoDB" : "olSourceCarto",
+      "ol/loadingstrategy" : "OlLoadingStrategy",
+      "ol/source/TileArcGISRest" : "olSourceTileArcGISRest",
+      "ts-md5" : "tsMd5",
+      "ol/source/VectorTile" : "olSourceVectorTile",
+      "ol/format/MVT" : "olFormatMVT",
+      "ol/source/Cluster" : "olSourceCluster",
+      "ngx-cacheable" : "ngxCacheable",
+      "ol/source/WMTS.js" : "WMTS_js",
+      "ol/Map" : "olMap",
+      "ol/View" : "olView",
+      "ol/Geolocation" : "olGeolocation",
+      "ol/control/Attribution" : "olAttribution",
+      "ol/control/ScaleLine" : "olControlScaleLine",
+      "ol/geom/Circle" : "olCircle",
+      "ol/layer/Image" : "olLayerImage",
+      "ol/layer/Tile" : "olLayerTile",
+      "ol/color" : "color",
+      "ol/layer/VectorTile" : "olLayerVectorTile",
+      "ol/easing" : "oleasing",
+      "ol/has" : "has",
+      "proj4" : "proj4",
+      "ol/proj/proj4" : "olproj4",
+      "ol/format/GML2" : "olFormatGML2",
+      "ol/format/GML3" : "olFormatGML3",
+      "ol/format/EsriJSON" : "olFormatEsriJSON",
+      "ol/proj/Projection" : "olProjection",
+      "@mat-datetimepicker/core" : "datepickercore",
+      "ol/geom/Point" : "OlPoint",
+      "ol/Overlay" : "OlOverlay",
+      "ol/sphere" : "sphere",
+      "ol/style/Style" : "OlStyle",
+      "ol/geom/LineString" : "OlLineString",
+      "@turf/line-intersect" : "lineIntersect",
+      "@turf/helpers" : "helpers",
+      "ol/interaction/Modify" : "OlModify",
+      "ol/interaction/Translate" : "OlTranslate",
+      "ol/interaction/Draw" : "OlDraw",
+      "ol/geom/Polygon" : "OlPolygon",
+      "ol/geom/LinearRing" : "OlLinearRing",
+      "ol/interaction/DragBox" : "OlDragBoxInteraction",
+      "ol/source/Vector" : "OlVectorSource",
+      "ol/layer/Vector" : "OlVectorLayer",
+      "moment" : "moment",
+      "ol/format/WKT" : "olWKT",
+      "file-saver" : "fileSaver",
+      "jspdf" : "jsPDF",
+      "html2canvas" : "_html2canvas",
+      "jszip" : "JSZip",
+      "ol/Feature" : "olFeature",
+      "ol/geom" : "olgeom",
+      "ol/proj" : "olproj",
+      "ol/style" : "olstyle",
+      "ol/events/condition" : "olcondition",
+      "ol/interaction" : "olinteraction",
+      "ol/extent" : "olextent",
+      "ol/Observable" : "olobservable",
+      "@igo2/auth" : "auth",
+      "ol/format/GeoJSON" : "OlGeoJSON",
+      "@igo2/common" : "common",
+      "ol/format" : "olformat",
+      "@igo2/utils" : "utils",
+      "@igo2/core" : "core"
+    }
   },
   "whitelistedNonPeerDependencies": [
     "ts-md5",

diff --git a/packages/geo/src/lib/feature/shared/strategies/selection.ts b/packages/geo/src/lib/feature/shared/strategies/selection.ts
@@ -150,7 +150,7 @@ export class FeatureStoreSelectionStrategy extends EntityStoreStrategy {
         map((records: EntityRecord<Feature>[]) => records.map(record => record.entity))
       );
     });
-    this.stores$$ = combineLatest(...stores$)
+    this.stores$$ = combineLatest(stores$)
       .pipe(
         debounceTime(5),
         skip(1), // Skip intial selection

diff --git a/packages/integration/ng-package.json b/packages/integration/ng-package.json
@@ -3,6 +3,14 @@
   "dest": "../../dist/integration",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/geo" : "geo",
+      "ol/format/GeoJSON" : "olFormatGeoJSON",
+      "ol/style" : "olstyle",
+      "@igo2/core" : "core",
+      "@igo2/context" : "context",
+      "@igo2/common" : "common"
+    }
   }
 }
diff --git a/packages/integration/ng-package.prod.json b/packages/integration/ng-package.prod.json
@@ -2,6 +2,14 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/integration",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "@igo2/geo" : "igoGeo",
+      "ol/format/GeoJSON" : "olFormatGeoJSON",
+      "ol/style" : "olstyle",
+      "@igo2/core" : "igoCore",
+      "@igo2/context" : "igoContext",
+      "@igo2/common" : "igoCommon"
+    }
   }
 }
diff --git a/packages/utils/ng-package.prod.json b/packages/utils/ng-package.prod.json
@@ -2,7 +2,10 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/utils",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public_api.ts",
+    "umdModuleIds": {
+      "bowser" : "bowser"
+    }
   },
   "whitelistedNonPeerDependencies": ["bowser"]
 }