Update project to map.apps version 4.18.3

conterra · Jan 8, 2025 · fa210a3 · fa210a3
1 parent e8f68e9
commit fa210a3
Show file tree

Hide file tree

Showing 9 changed files with 412 additions and 140 deletions.
diff --git a/.vscode/extensions.json 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-✅ Tested for map.apps 4.18.1 / Line 4
+✅ Tested for map.apps 4.18.3 / Linie 4
 
 #### Release Notes
 - autogenerated SNAPSHOT-Release
diff --git a/package.json b/package.json
@@ -9,15 +9,15 @@
         "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",
         "@types/license-checker": "^25.0.6",
         "@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
@@ -40,41 +40,23 @@
     </pluginRepositories>
     <dependencyManagement>
         <dependencies>
+            <!-- dependency versions available -->
             <dependency>
                 <groupId>de.conterra.mapapps</groupId>
-                <artifactId>ct-mapapps</artifactId>
+                <artifactId>ct-mapapps-js-bom</artifactId>
                 <version>${mapapps.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- include for vue-devtools support -->
+        <!-- include only if old intern test libs are required -->
         <dependency>
-            <groupId>org.vuejs</groupId>
-            <artifactId>vue</artifactId>
-            <classifier>dev</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.vuetifyjs</groupId>
-            <artifactId>vuetify</artifactId>
-            <classifier>dev</classifier>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- test support libs -->
-        <dependency>
-            <groupId>de.conterra.jsrt</groupId>
-            <artifactId>ct-jsrt-test-intern</artifactId>
-            <version>${ct.jsrt-test.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>de.conterra.jsrt</groupId>
-            <artifactId>ct-jsrt-test-uitest</artifactId>
-            <version>${ct.jsrt-test.version}</version>
+            <groupId>de.conterra.mapapps</groupId>
+            <artifactId>ct-mapapps-js-bom-dev-test</artifactId>
+            <version>${mapapps.version}</version>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -277,7 +259,6 @@
                                     <!-- unpack stylus files provided by beautify to map.apps themes -->
                                     <groupId>org.vuetifyjs</groupId>
                                     <artifactId>vuetify</artifactId>
-                                    <version>${vuetify.version}</version>
                                     <classifier>dev</classifier>
                                     <outputDirectory>${project.build.directory}/unpacked/layout</outputDirectory>
                                     <includes>vuetify/stylus/**</includes>
@@ -293,6 +274,8 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/bundle-imports</outputDirectory>
+                            <includeTypes>jar</includeTypes>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>
@@ -493,8 +476,7 @@
     </build>
     <scm>
         <connection>scm:git:https://github.com/conterra/mapapps-popups-action-screenshot.git</connection>
-        <developerConnection>scm:git:https://github.com/conterra/mapapps-popups-action-screenshot.git
-        </developerConnection>
+        <developerConnection>scm:git:https://github.com/conterra/mapapps-popups-action-screenshot.git</developerConnection>
         <url>https://github.com/conterra/mapapps-popups-action-screenshot</url>
         <tag>HEAD</tag>
     </scm>
@@ -513,13 +495,12 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.18.1</mapapps.version>
-        <vuetify.version>1.5.30</vuetify.version>
+        <mapapps.version>4.18.3</mapapps.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
+
         <!-- java lib versions -->
-        <ct.jsregistry.version>2.1.1</ct.jsregistry.version>
-        <ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
+        <ct.jsregistry.version>2.1.3</ct.jsregistry.version>
 
         <!-- the default app, replaced in the *.html files to switch app names-->
         <default.app.name>sample</default.app.name>
@@ -548,7 +529,7 @@
         required -->
         <mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
         <!-- enable this if "upload" profile should only deploy bundles -->
-        <skip.apps.upload>false</skip.apps.upload>
+        <skip.apps.upload>true</skip.apps.upload>
         <!-- enable this if "upload" profile should pre-optimize apps -->
         <triggerPreOptimization>false</triggerPreOptimization>
     </properties>
@@ -558,47 +539,9 @@
             <dependencies>
                 <dependency>
                     <groupId>de.conterra.mapapps</groupId>
-                    <artifactId>ct-mapapps-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dojo-release</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dgrid</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dstore</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.esri.js</groupId>
-                    <artifactId>ags-js-api4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.esri</groupId>
-                    <artifactId>terraformer-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>moment-js</groupId>
-                    <artifactId>moment-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>de.conterra.js</groupId>
-                    <artifactId>apprt-polyfill</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>de.conterra.js</groupId>
-                    <artifactId>reactivity</artifactId>
+                    <artifactId>ct-mapapps-js-bom-dev</artifactId>
+                    <version>${mapapps.version}</version>
+                    <type>pom</type>
                     <scope>test</scope>
                 </dependency>
             </dependencies>