diff --git a/packages/auth/ng-package.json b/packages/auth/ng-package.json index ea2da332f3..903347ea2a 100644 --- 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", "ngx-cacheable", "ts-md5"] } diff --git a/packages/auth/ng-package.prod.json b/packages/auth/ng-package.prod.json index d162ab0b02..1425826786 100644 --- 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", "ngx-cacheable", "ts-md5"] } diff --git a/packages/common/ng-package.json b/packages/common/ng-package.json index 3997518438..16a9849e1b 100644 --- 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 index 48f29c1bc2..d0877b6879 100644 --- 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 index 12f235ce1b..53b1ce7526 100644 --- 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 { */ private liftJoinedSource(): Observable { 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 index ffbb8a3b09..543d9c0cc5 100644 --- 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 index cff295f910..41cb284f61 100644 --- 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 index d0cc159052..c4eae6bc0e 100644 --- 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 index de38e63197..1c1fd3057b 100644 --- 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 index 2042d5d4b1..3de5ad3f0c 100644 --- 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 index 5b7acc2f8d..1044be5e14 100644 --- 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": [ "ngx-cacheable", diff --git a/packages/geo/ng-package.prod.json b/packages/geo/ng-package.prod.json index ff591d2e13..65b2248672 100644 --- 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": [ "ngx-cacheable", diff --git a/packages/geo/src/lib/feature/shared/strategies/selection.ts b/packages/geo/src/lib/feature/shared/strategies/selection.ts index 1bae53bae0..de6afcd63a 100644 --- 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[]) => 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 index 97be94a47a..2f1ba3ec01 100644 --- 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 index 0ea1622cf0..7cb0c25eb2 100644 --- 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 index 24296ac3df..309e3c4684 100644 --- 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"] }