diff --git a/package-lock.json b/package-lock.json index bfa71f7bb..e25f044da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "igo", - "version": "16.3.0", + "version": "17.0.0-next.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "igo", - "version": "16.3.0", + "version": "17.0.0-next.0", "license": "LiLiQ-R", "dependencies": { "@angular/animations": "^17.0.7", @@ -20,13 +20,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.2", + "@igo2/common": "^17.0.0-next.2", + "@igo2/context": "^17.0.0-next.2", + "@igo2/core": "^17.0.0-next.2", + "@igo2/geo": "^17.0.0-next.2", + "@igo2/integration": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "core-js": "^3.32.2", "hammerjs": "^2.0.8", "ol": "^7.5.2", @@ -3455,9 +3455,9 @@ } }, "node_modules/@igo2/auth": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/auth/-/auth-17.0.0-next.0.tgz", - "integrity": "sha512-oUQYjK1NqOMomhPrFRdtLAfyLByF0nhyUtg53FafjP6VNuo/pmaP3s3XiFQc4ItgSz+GPMfgl+lnr1Cl+RoMQw==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/auth/-/auth-17.0.0-next.2.tgz", + "integrity": "sha512-t2QmeSl+HS3SfnM+5heIaMAaAm+zWKg5V6jkzw0F0KAFEiEacm+LeilIEvUqK2QFl0d/nHaHLYAYgTnz4Lm98A==", "dependencies": { "jwt-decode": "^4.0.0", "ts-cacheable": "^1.0.6", @@ -3476,15 +3476,15 @@ "@angular/router": "^17.0.6", "@azure/msal-angular": "^3.0.4", "@azure/msal-browser": "^3.0.4", - "@igo2/core": "^17.0.0-next.0", - "@igo2/utils": "^17.0.0-next.0", + "@igo2/core": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "rxjs": "^7.8.0" } }, "node_modules/@igo2/common": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/common/-/common-17.0.0-next.0.tgz", - "integrity": "sha512-DnTTNGur3f4zpBrzcIA7E47BKYK+ZCrRvh43EWNtdEikSENIuQe2lgQVtmDaNLUpRl3bJ/eJ/ZJPL9me2prXcg==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/common/-/common-17.0.0-next.2.tgz", + "integrity": "sha512-Yf8Nn91Yfjo8gDHbzNX3pjzQGbEBBrHUbFLfRjxFyRz5RlRHMF5y5Yuh8cn3vLxY34hv0afgyH+LOAhOadepAg==", "dependencies": { "tslib": "^2.6.0" }, @@ -3497,8 +3497,8 @@ "@angular/material": "^17.0.3", "@angular/platform-browser": "^17.0.6", "@floating-ui/utils": "^0.1.4", - "@igo2/core": "^17.0.0-next.0", - "@igo2/utils": "^17.0.0-next.0", + "@igo2/core": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "angular-shepherd": "17.0.0", "ngx-color": "^9.0.0", "scroll-into-view-if-needed": "^3.0.0", @@ -3507,9 +3507,9 @@ } }, "node_modules/@igo2/context": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/context/-/context-17.0.0-next.0.tgz", - "integrity": "sha512-bQvm527aKbtyFpE5jQzZ1PCThiYttEgXHePnyk9EyIAbCL9hd9SBj0d5YwCl0OyVxWF4RgSJziERk8T7zg+AZg==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/context/-/context-17.0.0-next.2.tgz", + "integrity": "sha512-Hxvvw3uBjJCfMuM2xN3n70NYFS6ONUhptMhGOS+SQeRBUxDwS4WHIogQu0PCbo0r9hDap31c8/0NgSuE9aSx6A==", "dependencies": { "tslib": "^2.6.0" }, @@ -3523,19 +3523,19 @@ "@angular/forms": "^17.0.6", "@angular/material": "^17.0.3", "@angular/platform-browser": "^17.0.6", - "@igo2/auth": "^17.0.0-next.0", - "@igo2/common": "^17.0.0-next.0", - "@igo2/core": "^17.0.0-next.0", - "@igo2/geo": "^17.0.0-next.0", - "@igo2/utils": "^17.0.0-next.0", + "@igo2/auth": "^17.0.0-next.2", + "@igo2/common": "^17.0.0-next.2", + "@igo2/core": "^17.0.0-next.2", + "@igo2/geo": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "ol": "^7.5.2", "rxjs": "^7.8.0" } }, "node_modules/@igo2/core": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/core/-/core-17.0.0-next.0.tgz", - "integrity": "sha512-a7MnL4AWJpfU9xz/5q9Ujv/RrFKCd7L6Ko6fDFfFGJe4gkoKyFSAA10AXOk9lmocyqvDXAFB46UC9RE6NQrgzA==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/core/-/core-17.0.0-next.2.tgz", + "integrity": "sha512-2RS7pPM/NOC+/7RF11dciegN2JJvev0cnvjCWxwaWX29RfY01KTAy/lypNias425BVuNi3SYtpDhAeIHJWi4zw==", "dependencies": { "@ngx-translate/core": "^15.0.0", "tslib": "^2.6.0" @@ -3549,7 +3549,7 @@ "@angular/core": "^17.0.6", "@angular/platform-browser": "^17.0.6", "@angular/router": "^17.0.6", - "@igo2/utils": "^17.0.0-next.0", + "@igo2/utils": "^17.0.0-next.2", "@sentry/angular-ivy": "^7.87.0", "ngx-indexed-db": "^11.0.2", "ngx-toastr": "^18.0.0", @@ -3557,9 +3557,9 @@ } }, "node_modules/@igo2/geo": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/geo/-/geo-17.0.0-next.0.tgz", - "integrity": "sha512-G1XOo+lm4QwxPbG6UFnRgN4o/XWSBY6roXH1ICo3EbZJ/Dyiq572b2sTaj1zG5AiEbI59MWV33jgC7Rl9zae6A==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/geo/-/geo-17.0.0-next.2.tgz", + "integrity": "sha512-HdaBjslwta7iVvmZAngMCp+PSwiNVUAPSuk/2xMqYmfMqvToI7JU1XhFZIhhMPD6RLzrawgUTecjbzFm3aYtIA==", "dependencies": { "@turf/helpers": "^6.5.0", "@turf/line-intersect": "^6.5.0", @@ -3581,10 +3581,10 @@ "@angular/material": "^17.0.3", "@angular/material-moment-adapter": "^17.1.0", "@angular/platform-browser": "^17.0.6", - "@igo2/auth": "^17.0.0-next.0", - "@igo2/common": "^17.0.0-next.0", - "@igo2/core": "^17.0.0-next.0", - "@igo2/utils": "^17.0.0-next.0", + "@igo2/auth": "^17.0.0-next.2", + "@igo2/common": "^17.0.0-next.2", + "@igo2/core": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "@mat-datetimepicker/core": "~13.0.0", "file-saver": "^2.0.2", "flexsearch": "0.7.21", @@ -3603,9 +3603,9 @@ } }, "node_modules/@igo2/integration": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/integration/-/integration-17.0.0-next.0.tgz", - "integrity": "sha512-GCPzNDMR6/O14xea8iCLrhzUA1ZNp49btPyDpJHrmbxdM42ILvrMQ19VNxrn1w/M99Ggep8lMZ++Txgu4SH4WA==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/integration/-/integration-17.0.0-next.2.tgz", + "integrity": "sha512-kCq+O7hHvqx4WiiFrMNSu6qj3h5CEQfhxF1F96fqm86mG6VLY0EJBT6PZqOsGne+EET0ke5pys5Yf6zz4CPxLQ==", "dependencies": { "tslib": "^2.6.0" }, @@ -3615,18 +3615,18 @@ "peerDependencies": { "@angular/common": "^17.0.6", "@angular/core": "^17.0.6", - "@igo2/auth": "^17.0.0-next.0", - "@igo2/context": "^17.0.0-next.0", - "@igo2/geo": "^17.0.0-next.0", + "@igo2/auth": "^17.0.0-next.2", + "@igo2/context": "^17.0.0-next.2", + "@igo2/geo": "^17.0.0-next.2", "jspdf": "^2.5.1", "jspdf-autotable": "^3.5.29", "rxjs": "^7.8.0" } }, "node_modules/@igo2/utils": { - "version": "17.0.0-next.0", - "resolved": "https://registry.npmjs.org/@igo2/utils/-/utils-17.0.0-next.0.tgz", - "integrity": "sha512-R7cNnFxQG1kRktaF7X2tx9KKHvcCg1gk5ft4Ws8vSNkVJruPcKKWJrrgcsnAXBuyU/O9ONXhlXElFUfNYXrl1w==", + "version": "17.0.0-next.2", + "resolved": "https://registry.npmjs.org/@igo2/utils/-/utils-17.0.0-next.2.tgz", + "integrity": "sha512-XuKTe6YJFDgixj8aFjmk9rrXUrtHoV29blgReisLwwpKD1YQqNvwf5xljJKr6igUI8AhH3GQu9yzUGBCNKW95w==", "dependencies": { "bowser": "^2.10.0", "tslib": "^2.6.0" @@ -10722,6 +10722,108 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/execa/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/execa/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/executable": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", @@ -11478,18 +11580,6 @@ "node": ">=8.0.0" } }, - "node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/getos": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz", @@ -12655,18 +12745,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-text-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", @@ -14308,18 +14386,6 @@ "node": ">= 0.6" } }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mini-css-extract-plugin": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz", @@ -15010,33 +15076,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", - "dev": true, - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -15405,21 +15444,6 @@ "wrappy": "1" } }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/open": { "version": "8.4.2", "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", @@ -18110,18 +18134,6 @@ "node": ">=4" } }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", diff --git a/package.json b/package.json index 98048f1a1..fa4a2dc21 100644 --- 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.2", + "@igo2/common": "^17.0.0-next.2", + "@igo2/context": "^17.0.0-next.2", + "@igo2/core": "^17.0.0-next.2", + "@igo2/geo": "^17.0.0-next.2", + "@igo2/integration": "^17.0.0-next.2", + "@igo2/utils": "^17.0.0-next.2", "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 index dea232f33..840a04a62 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,9 @@ import { NavigationEnd, Router } from '@angular/router'; import { AuthFormComponent, AuthOptions } from '@igo2/auth'; 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 index 1d1870c9a..5d6e42159 100644 --- 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 index 6ff219a65..704766d8e 100644 --- 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 index c4c694683..e802c0dbe 100644 --- 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/src/app/pages/portal/expansion-panel/expansion-panel-button/expansion-panel-button.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel-button/expansion-panel-button.component.ts index 8d9081d97..6d8634a05 100644 --- a/src/app/pages/portal/expansion-panel/expansion-panel-button/expansion-panel-button.component.ts +++ b/src/app/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 index 464b80d83..a4d5634d0 100644 --- 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 index e87615c39..10f800a53 100644 --- 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 index fb5369ab9..a32ba7e2d 100644 --- 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 index 8e919044d..3dce78ee7 100644 --- 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 index be7d38e10..f74ee9be7 100644 --- 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 index 6e82d2711..a3035b2fa 100644 --- 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 index 63f998314..c4680105f 100644 --- 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 index 01d635c57..e283f061f 100644 --- 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 index 55641f83f..3a3814149 100644 --- 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 index 02ae77888..951452812 100644 --- 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 index 3e428f2a4..30463234a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,14 +17,11 @@ 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 { 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';