Skip to content

Commit

Permalink
Update to map.apps 4.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasstein committed Jan 11, 2024
1 parent 0ac9748 commit 65f6bfe
Show file tree
Hide file tree
Showing 12 changed files with 615 additions and 71 deletions.
8 changes: 4 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "eslint-config-ct-prodeng",
"plugins": [
"vue"
]
"extends": "eslint-config-ct-prodeng",
"plugins": [
"vue"
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
/.vscode/settings.json
/.externalToolBuilders/
/package-lock.json
/gulpfile.overrides.js
460 changes: 460 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
✅ Tested for map.apps 4.15.1 / Linie 4
✅ Tested for map.apps 4.16.0 / Linie 4

#### Release Notes
- autogenerated SNAPSHOT-Release
7 changes: 2 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -139,7 +137,6 @@ gulp.task("lint",
gulp.task("preview",
gulp.series(
"build",
"lint",
gulp.parallel(
"watch",
"browser-sync"
Expand Down
34 changes: 34 additions & 0 deletions gulpfile.overrides-sample.js
Original file line number Diff line number Diff line change
@@ -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,
};
39 changes: 24 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,31 @@
"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.1",
"@conterra/mapapps-mocha-runner": "^1.1.1",
"@types/arcgis-js-api": "4.26.0",
"chai": "^4.3.7",
"ct-mapapps-browser-sync": "0.0.30",
"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-template-compiler": "2.7.15"
}
}
57 changes: 19 additions & 38 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -81,7 +76,6 @@
<version>${ct.jsrt-test.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
<build>
<pluginManagement>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -408,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 -->
Expand All @@ -416,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>
Expand Down Expand Up @@ -495,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.1</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.10</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-->
Expand Down Expand Up @@ -562,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>
Expand Down
59 changes: 59 additions & 0 deletions src/support/js/check-licenses.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
Checks licenses of node dependencies against a list of allowed licenses.
Fails with exit code != 0 and an error message if a disallowed license is encountered.
The script should be executed from the project root directory after dependencies have been installed:
$ tsx ./src/support/js/check-licenses.ts
To run checks yourself (e.g. to update the allow list or to get details), install
license-checker yourself and run it from the project root directory:
$ npm install -g license-checker
$ license-checker --summary # outputs list of used licenses
$ license-checker --json # outputs details
See also https://www.npmjs.com/package/license-checker
*/

import { init as initChecker } from "license-checker";
import { cwd, exit} from "node:process";

// Licenses known to be OK.
const ACCEPTED_LICENSES = [
"MIT",
"ISC",
"Apache-2.0",
"Apache 2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"BSD",
"CC0-1.0",
"CC-BY-3.0",
"CC-BY-4.0",
"Python-2.0",
"Unlicense" // Note: not unlicenseD (https://opensource.org/licenses/unlicense)
];

// Packages with licenses that are not recognized properly by license-checker.
// These must be checked manually.
const SKIP_PACKAGES = [
"[email protected]", // MIT License not recognized
"[email protected]" // BSD-1-Clause License in source code
];

initChecker(
{
start: cwd(),
onlyAllow: ACCEPTED_LICENSES.join(";"),
excludePackages: SKIP_PACKAGES.join(";")
},
(error, packages) => {
void packages; // currently unused

if (error) {
console.error("Error: ", error);
exit(1);
}
exit(0);
}
);
11 changes: 5 additions & 6 deletions src/test/webapp/js/tests/test-init.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
*/
testConfig({
jsregistry: [{
//root: "url to registry..",
packages: [
// register all self hosted packages
"*"
]
}
//root: "url to registry..",
packages: [
// register all self hosted packages
"*"
]}
//uncomment, if project runs in remote mode
// ,{
// root: "@@mapapps.remote.base@@/resources/jsregistry/root",
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@
.dj_ie .start.notheme .dijitInputInner,
.dj_gecko .start.notheme .dijitInputInner{
height: 22px;
}
}
6 changes: 5 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
},
"allowJs": true,
"noEmit": true,
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"skipLibCheck": true,
"esModuleInterop": true
}
},
"include": ["src"]
}

0 comments on commit 65f6bfe

Please sign in to comment.