From dc314e04fe31780f9fc160e69d1e64de2295d5ad Mon Sep 17 00:00:00 2001 From: Sebastian Holtkamp Date: Thu, 9 Jan 2025 09:46:30 +0100 Subject: [PATCH] Update project to map.apps version 4.18.3 --- .vscode/extensions.json | 8 ++ .vscode/launch.json | 15 ++++ .vscode/tasks.json | 37 ++++++-- RELEASE.md | 2 +- package.json | 4 +- pom.xml | 91 ++++---------------- src/{main => }/support/js/check-licenses.ts | 0 src/test/webapp/favicon.ico | Bin 1150 -> 0 bytes tsconfig.json | 2 +- 9 files changed, 73 insertions(+), 86 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json rename src/{main => }/support/js/check-licenses.ts (100%) delete mode 100644 src/test/webapp/favicon.ico diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..95f81be --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "vue.volar", + "Esri.arcgis-jsapi-snippets", + "ctjdr.vscode-apprt-bundles" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..29fadc6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:9090", + "webRoot": "${workspaceFolder}/src/main" + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 93297ba..d1643d5 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,33 +3,54 @@ "tasks": [ { "label": "Initialize", + "detail": "Initialize map.apps for Developers project", "type": "shell", "command": "mvn initialize", "group": "build" }, { - "label": "Run HTTP Server", + "label": "Run", + "detail": "Run map.apps for Developers development server", "type": "shell", - "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties'", - "group": "build" + "command": "mvn", + "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"], + "group": "build", + "isBackground": true }, { - "label": "Run stand-alone HTTP Server", + "label": "Run (Remote project mode)", + "detail": "Run map.apps for Developers development server in 'remote project' mode", "type": "shell", - "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties' -Pinclude-mapapps-deps", - "group": "build" + "command": "mvn", + "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"], + "group": "build", + "isBackground": true }, { "label": "Compress", + "detail": "Prepare bundles and apps for deployment on a map.apps instance", "type": "shell", - "command": "mvn install -P compress", - "group": "build" + "command": "mvn", + "args": ["clean", "install", "-Pcompress"], + "group": "build", + "presentation": { + "reveal": "always", + "panel": "dedicated" + } }, { "label": "Clean", "type": "shell", "command": "mvn clean", "group": "build" + }, + { + "label": "Watch types", + "detail": "Start TypeScript compiler in watch mode", + "type": "npm", + "script": "watch-types", + "group": "build", + "problemMatcher": [], } ] } diff --git a/RELEASE.md b/RELEASE.md index b14d54e..21716f2 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -✅ Tested for map.apps 4.18.1 / Linie 4 +✅ Tested for map.apps 4.18.3 / Linie 4 #### Release Notes - autogenerated SNAPSHOT-Release diff --git a/package.json b/package.json index 6c71dea..0f21b14 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "watch-types": "tsc -w --noEmit" }, "devDependencies": { - "@conterra/ct-mapapps-typings": "~4.18.1", + "@conterra/ct-mapapps-typings": "~4.18.3", "@conterra/mapapps-mocha-runner": "1.1.1", "@conterra/reactivity-core": "^0.4.0", "@types/chai": "4.3.10", @@ -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.41", "ct-mapapps-gulp-js": "0.10.3", "eslint-config-ct-prodeng": "1.4.0", "license-checker": "25.0.1", diff --git a/pom.xml b/pom.xml index 65e023a..b7464b3 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,10 @@ + de.conterra.mapapps - ct-mapapps + ct-mapapps-js-bom ${mapapps.version} pom import @@ -50,31 +51,12 @@ - + - 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 + ${mapapps.version} + pom test @@ -277,7 +259,6 @@ org.vuetifyjs vuetify - ${vuetify.version} dev ${project.build.directory}/unpacked/layout vuetify/stylus/** @@ -293,6 +274,8 @@ ${project.build.directory}/bundle-imports + jar + true @@ -493,8 +476,7 @@ scm:git:https://github.com/conterra/mapapps-popups-action-maximize.git - scm:git:https://github.com/conterra/mapapps-popups-action-maximize.git - + scm:git:https://github.com/conterra/mapapps-popups-action-maximize.git https://github.com/conterra/mapapps-popups-action-maximize HEAD @@ -513,13 +495,12 @@ ${project.build.directory}/webapp ${root.build.outputPath}/js - 4.18.1 - 1.5.30 + 4.18.3 ${mapapps.version} + - 2.1.1 - 2.0.2 + 2.1.3 sample @@ -548,7 +529,7 @@ required --> true - false + true false @@ -558,47 +539,9 @@ 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 + ${mapapps.version} + pom test diff --git a/src/main/support/js/check-licenses.ts b/src/support/js/check-licenses.ts similarity index 100% rename from src/main/support/js/check-licenses.ts rename to src/support/js/check-licenses.ts diff --git a/src/test/webapp/favicon.ico b/src/test/webapp/favicon.ico deleted file mode 100644 index 9728155fbe6052eb090d784786fa82fb6aba0100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYJ0^&l9`2NM7P{~vZZY;92# z5T69%Ur-EUM-k&!pt`9*{2vFNiq8y?9XRwMn}^dKK)oP$BCEy5K8ec>K)oRUV$*{x z_KSx4DRnj 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"] }