Updated to map.apps 4.18.1

.eslintrc

@@ -1,6 +1,6 @@
 {
-    "extends": "eslint-config-ct-prodeng",
-    "plugins": [
-        "vue"
-    ]
+	"extends": "eslint-config-ct-prodeng",
+	"plugins": [
+		"vue"
+	]
 }

.stylelintignore

@@ -1,3 +1,3 @@
 # add path patterns to ignore style files
 **/external-libs/**
-**/styles/dijit/**
+**/styles/dijit/**

LICENSE

@@ -178,15 +178,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,3 +199,4 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+

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

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.
@@ -64,15 +64,13 @@ mapapps.registerTasks({
     },
 
     /* a list of themes inside this project */
-    themes: [/*"sample-theme"*/],
+    themes: [],
     /* state that the custom theme will be dependant from map.apps everlasting theme that provides the base styles */
     hasBaseThemes: true,
     /* state that we want to support vuetify components and therefore need the vuetify core styles*/
     hasVuetify: true,
     themeChangeTargets: {
-        "vuetify": [
-            // "sample_theme"
-        ]
+        "vuetify": []
     },
     /* A list oft target browser versions. This should be streamlined with Esri JS API requirements. */
     transpileTargets: {
@@ -139,7 +137,6 @@ gulp.task("lint",
 gulp.task("preview",
     gulp.series(
         "build",
-        // "lint",
         gulp.parallel(
             "watch",
             "browser-sync"

package.json

@@ -9,15 +9,16 @@
         "watch-types": "tsc -w --noEmit"
     },
     "devDependencies": {
-        "@conterra/ct-mapapps-typings": "~4.16.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.34",
-        "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>
@@ -46,11 +47,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>de.conterra.mapapps</groupId>
-                <artifactId>ct-mapapps-js</artifactId>
-                <version>${mapapps.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -95,6 +91,10 @@
                     <artifactId>ct-jsregistry-maven-plugin</artifactId>
                     <version>${ct.jsregistry.version}</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -170,11 +170,6 @@
                     <artifactId>setproperties-maven-plugin</artifactId>
                     <version>1.0.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>de.conterra.jsrt</groupId>
-                    <artifactId>ct-jsrt-test-maven-plugin</artifactId>
-                    <version>${ct.jsrt-test.version}</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         <sourceDirectory>src/main/js</sourceDirectory>
@@ -200,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>
@@ -212,9 +230,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <!-- add here properties which are used in plugin configuration resolution -->
                     <properties>
-                        <!-- deployment of map.apps installation -->
                         <mapapps.remote.base>.</mapapps.remote.base>
                     </properties>
                 </configuration>
@@ -325,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>
@@ -341,6 +357,9 @@
                         <include>**/gulpfile.js</include>
                         <include>**/pom.xml</include>
                     </includes>
+                    <excludes>
+                        <exclude>src/main/js/**/*.min.js</exclude>
+                    </excludes>
                     <mapping>
                         <vue>XML_STYLE</vue>
                     </mapping>
@@ -410,6 +429,7 @@
                 <configuration>
                     <!-- only build zip files -->
                     <skipDeploy>true</skipDeploy>
+                    <createApp>false</createApp>
                     <sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
                     <outputDirectory>${project.build.directory}</outputDirectory>
                 </configuration>
@@ -421,6 +441,24 @@
                             <goal>deployApps</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>build-app-template</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>deployAppTemplate</goal>
+                        </goals>
+                        <configuration>
+                            <templateFile>${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
+                            <templateResources>
+                                <templateResource>
+                                    <directory>${js.build.outputPath}/apps/sample</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </templateResource>
+                            </templateResources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -475,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.16.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>1.5.14</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-->
@@ -558,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

@@ -32,9 +32,6 @@
             "dn_tocactiondatatable",
             "result-ui"
         ],
-        "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_tocactiondatatable/DatatableActionDefinitionFactory.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_tocactiondatatable/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_tocactiondatatable/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_tocactiondatatable/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_tocactiondatatable/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/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.