Update project to 4.13

conterra · May 16, 2022 · c8548aa · c8548aa
1 parent b3cef2f
commit c8548aa
Show file tree

Hide file tree

Showing 29 changed files with 338 additions and 347 deletions.
diff --git a/src/main/js/.eslintrc → .eslintrc b/src/main/js/.eslintrc → .eslintrc
diff --git a/.github/workflows/devnet-bundle-release.yml b/.github/workflows/devnet-bundle-release.yml
@@ -0,0 +1,30 @@
+name: devnet-bundle-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "Release version"
+        required: true
+      nextDevVersion:
+        description: "Next SNAPSHOT version"
+        required: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+     - uses: conterra/devnet-bundle-release-action@main
+       with:
+         nexus_id: ${{secrets.NEXUS_ID}}
+         nexus_user: ${{secrets.NEXUS_USER}}
+         nexus_user_pw: ${{secrets.NEXUS_USER_PW}}
+         nexus_url: ${{secrets.NEXUS_URL}}
+         nexus_url_release: ${{secrets.NEXUS_URL_RELEASE}}
+         nexus_url_snapshots: ${{secrets.NEXUS_URL_SNAPSHOTS}}
+         release_token: ${{secrets.RELEASE_TOKEN}}
+         git_mail: ${{secrets.GIT_MAIL}}
+         git_user: ${{secrets.GIT_USER}}
+         release_version: ${{ github.event.inputs.releaseVersion }}
+         next_dev_version: ${{ github.event.inputs.nextDevVersion }}
+         ms_teams_webhook_uri: ${{secrets.MS_TEAMS_WEBHOOK_URI}}
diff --git a/.github/workflows/devnet-bundle-snapshot.yml b/.github/workflows/devnet-bundle-snapshot.yml
@@ -0,0 +1,21 @@
+name: devnet-bundle-snapshot
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+     - uses: conterra/devnet-bundle-snapshot-action@main
+       with:
+         nexus_id: ${{secrets.NEXUS_ID}}
+         nexus_user: ${{secrets.NEXUS_USER}}
+         nexus_user_pw: ${{secrets.NEXUS_USER_PW}}
+         nexus_url: ${{secrets.NEXUS_URL}}
+         nexus_url_release: ${{secrets.NEXUS_URL_RELEASE}}
+         nexus_url_snapshots: ${{secrets.NEXUS_URL_SNAPSHOTS}}
+         release_token: ${{secrets.RELEASE_TOKEN}}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,25 +2,34 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Run Jetty Server",
+            "label": "Initialize",
             "type": "shell",
-            "command": "mvn clean jetty:run -Pwatch-all",
+            "command": "mvn initialize",
             "group": "build"
         },
         {
-            "label": "Run stand-alone Jetty Server",
+            "label": "Run HTTP Server",
             "type": "shell",
-            "command": "mvn clean jetty:run -P'watch-all,include-mapapps-deps'",
+            "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties'",
             "group": "build"
         },
         {
-            "label": "Install",
+            "label": "Run stand-alone HTTP Server",
             "type": "shell",
-            "command": "mvn clean install -Pcompress",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
+            "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties' -Pinclude-mapapps-deps",
+            "group": "build"
+        },
+        {
+            "label": "Compress",
+            "type": "shell",
+            "command": "mvn install -P compress",
+            "group": "build"
+        },
+        {
+            "label": "Clean",
+            "type": "shell",
+            "command": "mvn clean",
+            "group": "build"
         }
     ]
 }
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,4 @@
+✅ Tested for map.apps 4.13.1 / Linie 4
+
+#### Release Notes
+- SNAPSHOT-Release
diff --git a/build.properties b/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 con terra GmbH (info@conterra.de)
+# Copyright (C) 2022 con terra GmbH (info@conterra.de)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 # URL to the remote map.apps instance
-mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%
+# mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2022 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ mapapps.registerTasks({
     themes: [/*"sample-theme"*/],
     /* 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 the vuetify core styles*/
-    hasVuetify: true,
+    /* state that we want to support vuetify components and therefore need the vuetify core styles*/
+    hasVuetify: true
     /*themeChangeTargets: {
         "vuetify": [
             "sample_theme"
@@ -35,34 +35,18 @@ gulp.task("default",
     gulp.series(
         "copy-resources",
         "themes-copy",
-        gulp.parallel("js-transpile", "themes-compile")
+        gulp.parallel(
+            //"js-lint",
+            //"style-lint",
+            "js-transpile",
+            "themes-compile"
+        )
     )
 );
 
 gulp.task("compress",
     gulp.series(
-        "copy-resources",
-        "themes-copy",
-        gulp.parallel(
-            "js-transpile",
-            gulp.series(
-                "themes-compile",
-                "themes-compress"
-            )
-        )
+        "default",
+        "themes-compress"
     )
 );
-
-gulp.task("run-js-tests", function (done) {
-    const initialWait = 10000;
-    setTimeout(() => {
-        const trigger = gulp.series("run-browser-tests");
-        trigger(done);
-    }, initialWait);
-});
-
-gulp.task("skip", function (done) {
-    setTimeout(() => {
-        done();
-    }, 1);
-});
diff --git a/package.json b/package.json
@@ -3,12 +3,15 @@
     "description": "test build",
     "version": "0.0.1",
     "devDependencies": {
-        "@conterra/ct-mapapps-typings": "~4.11.1",
-        "@types/arcgis-js-api": "4.18.0",
-        "ct-mapapps-gulp-js": "^0.5.16",
-        "vue-template-compiler": "2.6.6",
-        "puppeteer": "^5.5.0",
-        "eslint-config-ct-prodeng": "^1.1.16",
-        "stylelint-config-ct-prodeng": "1.0.3"
+        "@conterra/ct-mapapps-typings": "4.13.1",
+        "@conterra/mapapps-mocha-runner": "^1.0.0",
+        "@types/arcgis-js-api": "4.22.0",
+        "ct-mapapps-gulp-js": "^0.6.18",
+        "vue-template-compiler": "2.6.14",
+        "puppeteer": "^13.3.2",
+        "eslint-config-ct-prodeng": "^1.2.5",
+        "stylelint-config-ct-prodeng": "1.0.3",
+        "chai": "^4.3.4",
+        "mocha": "^9.0.0"
     }
 }