From 0cd99a96293691deef2d6bd9418d2d6951edae1c Mon Sep 17 00:00:00 2001 From: Marko Reiprecht Date: Fri, 24 May 2024 11:37:09 +0200 Subject: [PATCH 01/11] Prepare 4.18.2 - use boms to reduce list of dependencies --- pom.xml | 84 +++++++++------------------------------------------------ 1 file changed, 12 insertions(+), 72 deletions(-) diff --git a/pom.xml b/pom.xml index 38e2abb..ecea5ad 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,10 @@ + de.conterra.mapapps - ct-mapapps + ct-mapapps-js-bom ${mapapps.version} pom import @@ -33,31 +34,11 @@ - + - org.vuejs - vue - dev - test - - - org.vuetifyjs - vuetify - dev - test - - - - - de.conterra.jsrt - ct-jsrt-test-intern - ${ct.jsrt-test.version} - test - - - de.conterra.jsrt - ct-jsrt-test-uitest - ${ct.jsrt-test.version} + de.conterra.mapapps + ct-mapapps-js-bom-dev-test + pom test @@ -238,7 +219,6 @@ org.vuetifyjs vuetify - ${vuetify.version} dev ${project.build.directory}/unpacked/layout vuetify/stylus/** @@ -254,6 +234,7 @@ ${project.build.directory}/bundle-imports + jar @@ -313,8 +294,7 @@ - - \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s* + \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s* @@ -370,13 +350,12 @@ ${project.build.directory}/webapp ${root.build.outputPath}/js - 4.18.1 - 1.5.30 + 4.18.2-SNAPSHOT ${mapapps.version} + 2.1.1 - 2.0.2 Demo @@ -415,47 +394,8 @@ de.conterra.mapapps - ct-mapapps-js - test - - - org.dojotoolkit - dojo-release - test - - - org.dojotoolkit - dgrid - test - - - org.dojotoolkit - dstore - test - - - com.esri.js - ags-js-api4 - test - - - com.esri - terraformer-js - test - - - moment-js - moment-js - test - - - de.conterra.js - apprt-polyfill - test - - - de.conterra.js - reactivity + ct-mapapps-js-bom-dev + pom test From e2fbbfff77cbe689dd2bca857fc82cc296d5159a Mon Sep 17 00:00:00 2001 From: Marko Reiprecht Date: Fri, 24 May 2024 11:47:04 +0200 Subject: [PATCH 02/11] add true to make updates easier --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index ecea5ad..5ef748a 100644 --- a/pom.xml +++ b/pom.xml @@ -235,6 +235,7 @@ ${project.build.directory}/bundle-imports jar + true From 9124d71fb0873b4350bef7114ca5f94e717ed582 Mon Sep 17 00:00:00 2001 From: Marko Reiprecht Date: Fri, 24 May 2024 12:07:48 +0200 Subject: [PATCH 03/11] update changelog --- CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1ceb56..ad01728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,53 @@ All notable changes to this project will be documented in this file. +## [4.18.2] - tbd + +- Support for map.apps 4.18.2 + +### Changes in pom.xml + +Introduce use of ct-mapapps-js-bom-* dependencies to reduce the list of manual maintained sub dependencies. + +- Update `mapapps.version` property to `4.18.2` +- Remove all occurrences of `vuetify.version` +- Remove all occurrences of `ct.jsrt-test.version` +- Replace `ct-mapapps` in `` by `ct-mapapps-js-bom` +- Replace all `` by following snippet + + ```xml + + + + de.conterra.mapapps + ct-mapapps-js-bom-dev-test + pom + test + + + ``` + + - Replace profile `include-mapapps-deps` by + + ```xml + + include-mapapps-deps + + + de.conterra.mapapps + ct-mapapps-js-bom-dev + pom + test + + + + ``` + + - add `true` to `` of `copy-dependencies` + +### Changes in package.json +- Update `@conterra/ct-mapapps-typings` to `4.18.2` + ## [4.18.1] - 23.05.2024 - Support for map.apps 4.18.1 From 8ebe64baad4784fd90627bc5449d00718e140a12 Mon Sep 17 00:00:00 2001 From: Marko Reiprecht Date: Fri, 31 May 2024 09:37:44 +0200 Subject: [PATCH 04/11] drop ref to old vue plugin --- .vscode/extensions.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b425eee..d5ff796 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "dbaeumer.vscode-eslint", - "vue.volar", - "vue.vscode-typescript-vue-plugin" + "vue.volar" ] } \ No newline at end of file From d6b8b2c46279a5301119c66f1898c8f48b2557ec Mon Sep 17 00:00:00 2001 From: Marko Reiprecht Date: Fri, 7 Jun 2024 23:20:10 +0200 Subject: [PATCH 05/11] MAPAPPS-7132 - update browsersync to 0.0.40 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c71dea..4630f0b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/mocha": "10.0.4", "arcgis-js-api": "4.29.10", "chai": "4.3.10", - "ct-mapapps-browser-sync": "0.0.39", + "ct-mapapps-browser-sync": "0.0.40", "ct-mapapps-gulp-js": "0.10.3", "eslint-config-ct-prodeng": "1.4.0", "license-checker": "25.0.1", From 3f72f85475d6f44fa6cdd8868aa2fa97ca7a1e00 Mon Sep 17 00:00:00 2001 From: Martin Scherpinski Date: Tue, 16 Jul 2024 10:52:32 +0200 Subject: [PATCH 06/11] Update browser-sync to 0.0.41 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4630f0b..0d46db1 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/mocha": "10.0.4", "arcgis-js-api": "4.29.10", "chai": "4.3.10", - "ct-mapapps-browser-sync": "0.0.40", + "ct-mapapps-browser-sync": "0.0.41", "ct-mapapps-gulp-js": "0.10.3", "eslint-config-ct-prodeng": "1.4.0", "license-checker": "25.0.1", From c4d0b95d0c372890a16f338911d59243f19e3834 Mon Sep 17 00:00:00 2001 From: "m.scherpinski" Date: Tue, 16 Jul 2024 11:03:35 +0200 Subject: [PATCH 07/11] include arcgis typings --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index ff7e3ae..e8100df 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,5 +15,5 @@ "skipLibCheck": true, "esModuleInterop": true }, - "include": ["src"] + "include": ["src", "node_modules/arcgis-js-api/index.d.ts"] } From 075a2f899d35a7a60d0d823f28e87f72bd948f86 Mon Sep 17 00:00:00 2001 From: "m.scherpinski" Date: Tue, 16 Jul 2024 11:11:03 +0200 Subject: [PATCH 08/11] update changelog --- CHANGELOG.md | 6 +++++- README.md | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad01728..0ed1097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [4.18.2] - tbd +## [4.18.2] - 19.07.2024 - Support for map.apps 4.18.2 @@ -48,6 +48,10 @@ Introduce use of ct-mapapps-js-bom-* dependencies to reduce the list of manual m ### Changes in package.json - Update `@conterra/ct-mapapps-typings` to `4.18.2` +- Update `ct-mapapps-browser-sync` to `0.0.41` + +### Changes in tsconfig.json +- add ArcGIS typings: `"include": ["src", "node_modules/arcgis-js-api/index.d.ts"]` ## [4.18.1] - 23.05.2024 diff --git a/README.md b/README.md index b8700e4..8cb0471 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,18 @@ For more details refer to the [Developer's Guide](https://docs.conterra.de/en/ma ## Updating from older versions +### from 4.18.1 to 4.18.2 + +See [Changelog](./CHANGELOG.md#4182---19072024) + + ### from 4.18.0 to 4.18.1 -See [Changelog](./CHANGELOG.md#4118---23052024) +See [Changelog](./CHANGELOG.md#4181---23052024) ### from 4.17.0 to 4.18.0 -See [Changelog](./CHANGELOG.md#4118---17052024) +See [Changelog](./CHANGELOG.md#4180---17052024) ### from 4.16.0 to 4.17.0 From 3c330b5565780f9499c9086e2df1953294236129 Mon Sep 17 00:00:00 2001 From: "m.scherpinski" Date: Tue, 16 Jul 2024 11:45:00 +0200 Subject: [PATCH 09/11] add versions --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 5ef748a..6240753 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ de.conterra.mapapps ct-mapapps-js-bom-dev-test + ${mapapps.version} pom test @@ -396,6 +397,7 @@ de.conterra.mapapps ct-mapapps-js-bom-dev + ${mapapps.version} pom test From 01305c44a2fc247e409951fba050facff9c2c14b Mon Sep 17 00:00:00 2001 From: Julian Kuhlmann Date: Wed, 17 Jul 2024 07:59:41 +0200 Subject: [PATCH 10/11] prepare release 4.18.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6240753..8348e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ ${project.build.directory}/webapp ${root.build.outputPath}/js - 4.18.2-SNAPSHOT + 4.18.2 ${mapapps.version} From 83b9748b6f213efb9af20679b5f154cb965916f7 Mon Sep 17 00:00:00 2001 From: Martin Scherpinski Date: Wed, 24 Jul 2024 15:54:17 +0200 Subject: [PATCH 11/11] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ed1097..b189dd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [4.18.2] - 19.07.2024 +## [4.18.2] - 24.07.2024 - Support for map.apps 4.18.2