Update to map.apps 4.16.0

conterra · Feb 12, 2024 · 2c8815e · 2c8815e
1 parent 7305c85
commit 2c8815e
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 95 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,6 +1,6 @@
 {
-    "extends": "eslint-config-ct-prodeng",
-    "plugins": [
-        "vue"
-    ]
+	"extends": "eslint-config-ct-prodeng",
+	"plugins": [
+		"vue"
+	]
 }
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@
 /.vscode/settings.json
 /.externalToolBuilders/
 /package-lock.json
+/gulpfile.overrides.js
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,3 @@
+# add path patterns to ignore style files
+**/external-libs/**
+**/styles/dijit/**
diff --git a/.stylelintrc b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+	"extends": "stylelint-config-ct-prodeng"
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,4 +5,4 @@
         "Esri.arcgis-jsapi-snippets",
         "ctjdr.vscode-apprt-bundles"
     ]
-}
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,4 +12,4 @@
             "webRoot": "${workspaceFolder}/src/main"
         }
     ]
-}
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -13,7 +13,7 @@
             "detail": "Run map.apps for Developers development server",
             "type": "shell",
             "command": "mvn",
-            "args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
+            "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
             "group": "build",
             "isBackground": true
         },
@@ -22,7 +22,7 @@
             "detail": "Run map.apps for Developers development server in 'remote project' mode",
             "type": "shell",
             "command": "mvn",
-            "args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
+            "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
             "group": "build",
             "isBackground": true
         },
@@ -31,7 +31,7 @@
             "detail": "Prepare bundles and apps for deployment on a map.apps instance",
             "type": "shell",
             "command": "mvn",
-            "args": ["install", "-Pcompress"],
+            "args": ["clean", "install", "-Pcompress"],
             "group": "build",
             "presentation": {
                 "reveal": "always",

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,4 @@
-✅ Tested for map.apps 4.14.3 / Linie 4
+✅ Tested for map.apps 4.16.0 / Linie 4
 
 #### Release Notes
-- SNAPSHOT-Release
+- autogenerated SNAPSHOT-Release
diff --git a/gulpfile.js b/gulpfile.js
@@ -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: {
@@ -98,7 +96,12 @@ mapappsBrowserSync.registerTask({
 
     // to prevent auto open of browser, set this to false
     urlToOpen: localOverrides?.openBrowser ?? true,
-
+    properties: {
+        paths: [
+            // Ensure @@key@@ expressions filtered in tests files
+            /^\/js\/tests\/(runTests.html|test-init.js|init-packs.js)$/
+        ]
+    },
     jsreg: {
         //npmDir : __dirname + "/node_modules/",
         npmModules: [
@@ -126,7 +129,9 @@ gulp.task("build",
 gulp.task("lint",
     gulp.parallel(
         "js-lint"
-        //,"style-lint"
+        /*, comment in to lint .css/.less files
+        "style-lint"
+        */
     ));
 
 gulp.task("preview",

diff --git a/gulpfile.overrides-sample.js b/gulpfile.overrides-sample.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) con terra GmbH
+ */
+/*
+  Rename this file to `gulpfile.overrides.js`, then you are able to modify the listed build flags.
+
+  Do not commit this file, it is intended to be a local developer file.
+
+*/
+module.exports = {
+    // debug mode of ct-mapapps-gulp-js
+    debug: true,
+
+    // enable linting during watch
+    lintOnWatch: true,
+
+    // use https not http (uses self signed certificate )
+    https: false,
+
+    // should the browser reload the open windows if files change
+    autoReload: true,
+
+    // disable initial build before starting the dev server
+    previewNoInitialBuild: false,
+
+    // defines how much workers are maximal allowed to use (3 is enough)
+    rollupBuildMaxWorkers: 1,
+
+    // on which port should the dev server be opened
+    port: 9090,
+
+    // should the browser be opened pointing to the dev server?
+    openBrowser: true,
+};
diff --git a/package.json b/package.json
@@ -4,22 +4,32 @@
     "version": "0.0.1",
     "license": "CC0-1.0",
     "scripts": {
-        "check-licenses": "node ./src/support/js/check-licenses.js"
+        "check-licenses": "tsx ./src/support/js/check-licenses.ts",
+        "check-types": "tsc --noEmit",
+        "watch-types": "tsc -w --noEmit"
     },
     "devDependencies": {
-        "@conterra/ct-mapapps-typings": "4.15.0",
-        "@conterra/mapapps-mocha-runner": "^1.1.1",
-        "@types/arcgis-js-api": "4.26.0",
-        "chai": "^4.3.7",
-        "ct-mapapps-browser-sync": "0.0.27",
-        "ct-mapapps-gulp-js": "0.9.4",
-        "eslint-config-ct-prodeng": "1.3.0-next-2",
-        "license-checker": "^25.0.1",
-        "mocha": "^10.2.0",
-        "puppeteer": "^19.11.1",
-        "vue-template-compiler": "2.7.8",
-        "stylelint-config-ct-prodeng": "1.0.4",
-        "stylelint-config-recommended": "5.0.0",
-        "stylelint": "^13.13.1"
+        "@conterra/ct-mapapps-typings": "~4.16.0",
+        "@conterra/mapapps-mocha-runner": "1.1.1",
+        "@types/arcgis-js-api": "4.28.0",
+        "@types/chai": "4.3.10",
+        "@types/license-checker": "^25.0.6",
+        "@types/mocha": "10.0.4",
+        "chai": "4.3.10",
+        "ct-mapapps-browser-sync": "0.0.34",
+        "ct-mapapps-gulp-js": "0.10.2",
+        "eslint-config-ct-prodeng": "1.4.0",
+        "license-checker": "25.0.1",
+        "mocha": "10.2.0",
+        "puppeteer": "21.5.2",
+        "stylelint": "15.11.0",
+        "stylelint-config-ct-prodeng": "2.0.0",
+        "stylelint-config-recommended": "13.0.0",
+        "stylelint-config-recommended-less": "2.0.0",
+        "ts-node": "^10.9.1",
+        "tsx": "^4.6.0",
+        "typescript": "5.2.2",
+        "vue": "2.7.15",
+        "vue-template-compiler": "2.7.15"
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -46,11 +46,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>
@@ -81,7 +76,6 @@
             <version>${ct.jsrt-test.version}</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     <build>
         <pluginManagement>
@@ -143,10 +137,9 @@
                 <plugin>
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
-                    <version>1.12.1</version>
+                    <version>1.14.2</version>
                     <configuration>
-                        <nodeVersion>v18.13.0</nodeVersion>
-                        <npmVersion>8.19.3</npmVersion>
+                        <nodeVersion>v20.9.0</nodeVersion>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -224,22 +217,23 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>unpack-themes-src</id>
@@ -394,7 +388,8 @@
                             <goal>buildPacksProperties</goal>
                         </goals>
                         <configuration>
-                            <!-- don't list not shipped bundles in the META-INF\js-registry-packs.properties file -->
+                            <!-- don't list not shipped bundles in the
+                            META-INF\js-registry-packs.properties file -->
                             <scanPackagesExcludes>apps/**,bundles/sample_tests</scanPackagesExcludes>
                         </configuration>
                     </execution>
@@ -407,6 +402,12 @@
             <plugin>
                 <groupId>de.conterra.mapapps</groupId>
                 <artifactId>mapapps-maven-plugin</artifactId>
+                <configuration>
+                    <!-- only build zip files -->
+                    <skipDeploy>true</skipDeploy>
+                    <sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
                 <executions>
                     <execution>
                         <!-- used to create .zip files containing the apps during the build -->
@@ -415,32 +416,7 @@
                             <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>
-                <configuration>
-                    <!-- only build zip files -->
-                    <skipDeploy>true</skipDeploy>
-                    <createApp>false</createApp>
-                    <sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -494,11 +470,12 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.15.0</mapapps.version>
+        <mapapps.version>4.16.0</mapapps.version>
+        <vuetify.version>1.5.28</vuetify.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
         <!-- java lib versions -->
-        <ct.jsregistry.version>1.5.9</ct.jsregistry.version>
+        <ct.jsregistry.version>1.5.14</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-->
@@ -561,6 +538,11 @@
                     <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>