Skip to content

Commit 44acb63

Browse files
authored
Merge pull request #12 from conterra/dev_4.20
Dev 4.20
2 parents 5364f05 + 96caa19 commit 44acb63

17 files changed

Lines changed: 11906 additions & 84 deletions

File tree

.github/workflows/devnet-bundle-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
nexus_url: ${{secrets.NEXUS_URL}}
1919
nexus_url_release: ${{secrets.NEXUS_URL_RELEASE}}
2020
nexus_url_snapshots: ${{secrets.NEXUS_URL_SNAPSHOTS}}
21-
release_token: ${{secrets.RELEASE_TOKEN}}
21+
release_token: ${{secrets.TECHNICAL_USER_RELEASE_TOKEN}}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/.idea
22
/.vs
3+
/.env
34
**/nbactions.xml
45
**/*.iml
56
**/*.lnk

.vscode/extensions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
4-
"Vue.volar",
5-
"Esri.arcgis-jsapi-snippets",
4+
"vue.volar",
5+
"esri.arcgis-maps-sdk-js-snippets",
66
"ctjdr.vscode-apprt-bundles"
77
]
8-
}
8+
}

.vscode/tasks.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
"script": "watch-types",
5252
"group": "build",
5353
"problemMatcher": [],
54+
},
55+
{
56+
"label": "Init playwright tests",
57+
"detail": "Initialize playwright tests for this bundle",
58+
"type": "npm",
59+
"script": "npm init playwright@latest",
60+
"group": "build"
5461
}
5562
]
5663
}

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![devnet-bundle-snapshot](https://github.com/conterra/mapapps-charting/actions/workflows/devnet-bundle-snapshot.yml/badge.svg)](https://github.com/conterra/mapapps-charting/actions/workflows/devnet-bundle-snapshot.yml)
2-
![Static Badge](https://img.shields.io/badge/tested_for_map.apps-4.17.0-%20?labelColor=%233E464F&color=%232FC050)
2+
![Static Badge](https://img.shields.io/badge/requires_map.apps-4.20.0-e5e5e5?labelColor=%233E464F&logoColor=%23e5e5e5)
3+
![Static Badge](https://img.shields.io/badge/tested_for_map.apps-4.20.0-%20?labelColor=%233E464F&color=%232FC050)
34
# Charting
45

56
The Charting Bundle allows you to display various charts based on data from an AGSSearch store.
@@ -11,12 +12,8 @@ You can choose of a variety of different chart types like: bar, line, spline, ar
1112
## Sample App
1213
https://demos.conterra.de/mapapps/resources/apps/public_demo_charting/index.html?
1314

14-
## Installation Guide
15-
**Requirement: map.apps 4.11.0 since version 1.10.1**
16-
1715
[dn_charting Documentation](https://github.com/conterra/mapapps-charting/tree/master/src/main/js/bundles/dn_charting)
1816

19-
2017
## Quick start
2118

2219
Clone this project and ensure that you have all required dependencies installed correctly (see [Documentation](https://docs.conterra.de/en/mapapps/latest/developersguide/getting-started/set-up-development-environment.html)).

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
✅ Tested for map.apps 4.18.3 / Linie 4
1+
✅ Tested for map.apps 4.20.0 / Linie 4
22

33
#### Release Notes
44
- autogenerated SNAPSHOT-Release

gulpfile.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
const gulp = require("gulp");
1717
const mapapps = require('ct-mapapps-gulp-js');
1818
const mapappsBrowserSync = require("ct-mapapps-browser-sync");
19+
const dotEnv = require("dotenv");
20+
// load .env file if it exits
21+
// the local dev jsregistry will lookup any @@key.property@@ expression, also as environment variable with name "KEY_PROPERTY" for replacement.
22+
dotEnv.config();
1923

2024
const isProduction = process.env.NODE_ENV === "production";
2125
console.info(`Configuring gulp build for ${isProduction ? "production" : "development"}`);
@@ -107,6 +111,7 @@ mapappsBrowserSync.registerTask({
107111
npmModules: [
108112
"mocha",
109113
"chai",
114+
"sinon",
110115
"@conterra/mapapps-mocha-runner"
111116
]
112117
},

package.json

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,46 @@
44
"version": "0.0.1",
55
"license": "CC0-1.0",
66
"scripts": {
7-
"check-licenses": "tsx ./src/support/js/check-licenses.ts",
8-
"check-types": "tsc --noEmit",
9-
"watch-types": "tsc -w --noEmit"
7+
"check-licenses": "tsx ./src/support/js/check-licenses.ts",
8+
"check-types": "tsc --noEmit",
9+
"watch-types": "tsc -w --noEmit",
10+
"e2e-test": "playwright test",
11+
"e2e-test:headed": "playwright test --headed",
12+
"e2e-test:ui": "playwright test --ui"
13+
},
14+
"dependencies": {
15+
"@arcgis/core": "4.33.14",
16+
"vue": "2.7.16"
1017
},
1118
"devDependencies": {
12-
"@conterra/ct-mapapps-typings": "~4.18.3",
19+
"@conterra/ct-mapapps-typings": "4.20.0",
1320
"@conterra/mapapps-mocha-runner": "1.1.1",
14-
"@conterra/reactivity-core": "^0.4.0",
21+
"@conterra/reactivity-core": "0.8.0",
1522
"@playwright/test": "^1.52.0",
16-
"@types/chai": "4.3.10",
23+
"@types/chai": "4.3.20",
1724
"@types/license-checker": "^25.0.6",
18-
"@types/mocha": "10.0.4",
19-
"arcgis-js-api": "4.29.10",
20-
"chai": "4.3.10",
21-
"ct-mapapps-browser-sync": "0.0.41",
22-
"ct-mapapps-gulp-js": "0.10.3",
23-
"eslint-config-ct-prodeng": "1.4.0",
25+
"@types/mocha": "10.0.10",
26+
"@types/node": "^22.18.1",
27+
"@types/sinon": "^17.0.3",
28+
"chai": "4.5.0",
29+
"ct-mapapps-browser-sync": "0.0.47",
30+
"ct-mapapps-gulp-js": "0.10.15",
31+
"dojo-typings": "1.11.11",
32+
"dotenv": "17.2.3",
33+
"eslint": "8.57.1",
34+
"eslint-config-ct-prodeng": "1.5.0",
2435
"license-checker": "25.0.1",
25-
"mocha": "10.2.0",
26-
"puppeteer": "21.5.2",
27-
"stylelint": "15.11.0",
36+
"mocha": "11.7.4",
37+
"puppeteer": "24.25.0",
38+
"sinon": "19.0.2",
2839
"stylelint-config-ct-prodeng": "2.0.0",
29-
"stylelint-config-recommended": "13.0.0",
3040
"stylelint-config-recommended-less": "2.0.0",
41+
"stylelint-config-recommended": "13.0.0",
42+
"stylelint": "15.11.0",
3143
"ts-node": "^10.9.1",
32-
"tsx": "^4.6.0",
33-
"typescript": "5.4.5",
34-
"vue": "2.7.15",
35-
"vue-template-compiler": "2.7.15"
36-
}
44+
"tsx": "^4.20.5",
45+
"typescript": "5.9.2",
46+
"vue-template-compiler": "2.7.16"
47+
},
48+
"packageManager": "pnpm@10.18.3"
3749
}

0 commit comments

Comments
 (0)