Updated to map.apps 4.18.1

RELEASE.md

@@ -1,4 +1,4 @@
-✅ Tested for map.apps 4.16.0 / Linie 4
+✅ Tested for map.apps 4.18.1 / Line 4
 
 #### Release Notes
 - autogenerated SNAPSHOT-Release

build.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 con terra GmbH ([email protected])
+# Copyright (C) 2024 con terra GmbH ([email protected])
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

gulpfile.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "mapapps-4-developers",
+    "name": "mapapps-time-slider",
     "description": "test build",
     "version": "0.0.1",
     "license": "CC0-1.0",
@@ -9,15 +9,16 @@
         "watch-types": "tsc -w --noEmit"
     },
     "devDependencies": {
-        "@conterra/ct-mapapps-typings": "~4.17.0",
+        "@conterra/ct-mapapps-typings": "~4.18.1",
         "@conterra/mapapps-mocha-runner": "1.1.1",
-        "@types/arcgis-js-api": "4.28.0",
+        "@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.35",
-        "ct-mapapps-gulp-js": "0.10.2",
+        "ct-mapapps-browser-sync": "0.0.39",
+        "ct-mapapps-gulp-js": "0.10.3",
         "eslint-config-ct-prodeng": "1.4.0",
         "license-checker": "25.0.1",
         "mocha": "10.2.0",
@@ -28,7 +29,7 @@
         "stylelint-config-recommended-less": "2.0.0",
         "ts-node": "^10.9.1",
         "tsx": "^4.6.0",
-        "typescript": "5.2.2",
+        "typescript": "5.4.5",
         "vue": "2.7.15",
         "vue-template-compiler": "2.7.15"
     }

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023 con terra GmbH ([email protected])
+    Copyright (C) 2024 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.conterra.devnet</groupId>
@@ -119,6 +120,8 @@
                         <excludes>
                             <exclude>apps/**</exclude>
                             <exclude>**/tests/**</exclude>
+                            <exclude>**/sample_tests/**</exclude>
+                            <exclude>**/theme-common/**</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
@@ -192,6 +195,29 @@
             </testResource>
         </testResources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.8.0,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[17,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>de.conterra.maven</groupId>
                 <artifactId>setproperties-maven-plugin</artifactId>
@@ -315,7 +341,7 @@
                     <properties>
                         <owner>con terra GmbH</owner>
                         <email>[email protected]</email>
-                        <project.inceptionYear>2023</project.inceptionYear>
+                        <project.inceptionYear>2024</project.inceptionYear>
                     </properties>
                     <includes>
                         <include>src/main/js/**/*.js</include>
@@ -487,12 +513,12 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.17.0</mapapps.version>
-        <vuetify.version>1.5.28</vuetify.version>
+        <mapapps.version>4.18.1</mapapps.version>
+        <vuetify.version>1.5.30</vuetify.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
         <!-- java lib versions -->
-        <ct.jsregistry.version>2.0.1</ct.jsregistry.version>
+        <ct.jsregistry.version>2.1.1</ct.jsregistry.version>
         <ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
 
         <!-- the default app, replaced in the *.html files to switch app names-->
@@ -570,6 +596,11 @@
                     <artifactId>apprt-polyfill</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>de.conterra.js</groupId>
+                    <artifactId>reactivity</artifactId>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
         <profile>

src/main/config/assembly.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2023 con terra GmbH ([email protected])
+    Copyright (C) 2024 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

src/main/js/apps/sample/app.json

@@ -31,9 +31,6 @@
             "result-ui",
             "dn_timeslider"
         ],
-        "require": [
-            "${app}.app"
-        ],
         "i18n": [
             "bundle"
         ]

src/main/js/apps/sample/nls/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/apps/sample/nls/de/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/TimeSliderTocActionDefinitionFactory.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/TimeSliderWidgetController.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/TimeSliderWidgetFactory.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/css/styles.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/main.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/module.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/nls/bundle.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/nls/de/bundle.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/tests/TimeSliderWidgetController.spec.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_timeslider/tests/all.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/types/ExtendedLayer.d.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/js/types/TimesliderProperties.d.ts

@@ -1,5 +1,5 @@
 ///
-/// Copyright (C) 2023 con terra GmbH ([email protected])
+/// Copyright (C) 2024 con terra GmbH ([email protected])
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.

src/main/types/mocha-global.d.ts

@@ -0,0 +1 @@
+declare const testConfig: (opts?: Record<string, any>) => void;

src/main/types/thirdparty.d.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) con terra GmbH
+ */
+
+declare module "dojo/*";
+declare module "dijit/*";
+declare module "dojox/*";

src/main/types/vue-shim.d.ts

@@ -0,0 +1,4 @@
+declare module "*.vue" {
+    import Vue from "vue";
+    export default Vue;
+}

src/test/resources/application.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 con terra GmbH ([email protected])
+# Copyright (C) 2024 con terra GmbH ([email protected])
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/test/webapp/WEB-INF/web.xml

@@ -5,7 +5,7 @@
          version="3.0">
 
     <display-name>map.apps sample</display-name>
-    
+
     <!-- NOTE: a META-INF/web-fragment.xml from ct-jsregistry-embedded is also loaded together with this specification ! -->
 
     <servlet>
@@ -18,7 +18,7 @@
         <servlet-name>ProxyServlet</servlet-name>
         <url-pattern>/proxy</url-pattern>
     </servlet-mapping>
-         
+
     <servlet>
         <!-- Override init parameter to avoid nasty -->
         <!-- file locking issue on windows.
@@ -30,5 +30,5 @@
            <param-value>false</param-value>
         </init-param>
     </servlet>
-    
+
 </web-app>

src/test/webapp/index.html

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2023 con terra GmbH ([email protected])
+    Copyright (C) 2024 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
                     proxyUrl: url
                 });
             });
-            var trustedServers = "@@cors.request.trustedServers@@".split("\s*,\s*")
+            var trustedServers = "@@cors.request.trustedServers@@".split(/\s*,\s*/)
                     .filter(function(item){ return item && item.match(/^[^@.].*$/)});
             $apprt.changeConfig({
                 isDebug: true,

src/test/webapp/init.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/webapp/js/tests/init-packs.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/webapp/js/tests/runTests.html

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2023 con terra GmbH ([email protected])
+    Copyright (C) 2024 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

src/test/webapp/js/tests/test-init.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// eslint-disable-next-line no-undef
 testConfig({
     jsregistry: [{
         //root: "url to registry..",

src/test/webapp/login.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2023 con terra GmbH ([email protected])
+ * Copyright (C) 2024 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.