Skip to content

Commit

Permalink
Update project to map.apps 4.15.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sholtkamp committed Oct 25, 2023
1 parent c9e6e98 commit 7f6dc6a
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 34 deletions.
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# add path patterns to ignore style files
**/external-libs/**
**/styles/dijit/**
3 changes: 3 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "stylelint-config-ct-prodeng"
}
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.0 / Linie 4
✅ Tested for map.apps 4.15.1 / Linie 4

#### Release Notes
- autogenerated SNAPSHOT-Release
11 changes: 9 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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: [
Expand Down Expand Up @@ -126,7 +131,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",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"check-licenses": "node ./src/support/js/check-licenses.js"
},
"devDependencies": {
"@conterra/ct-mapapps-typings": "4.15.0",
"@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.27",
"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",
Expand Down
12 changes: 4 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>de.conterra.mapapps</groupId>
<artifactId>mapapps-maven-plugin</artifactId>
<version>${mapapps.version}</version>
</plugin>
<plugin>
<groupId>de.conterra.jsregistry</groupId>
<artifactId>ct-jsregistry-maven-plugin</artifactId>
Expand Down Expand Up @@ -394,7 +389,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>
Expand Down Expand Up @@ -493,11 +489,11 @@
<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.15.1</mapapps.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.10</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
21 changes: 0 additions & 21 deletions src/test/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ client.config.initjs=$\{mapapps.remote.base\}/resources/jsregistry/root/apprt-bo
# or change the name of the main layer file
client.config.mainlayerfiles=apprt/launch/layer

#local (embedded) js registry root url
jsregistry.root.url=${applicationURL.noscheme}/resources/jsregistry/root

# This is used to filter a default app name in the *.html files
default.app.name=${default.app.name}

Expand All @@ -47,12 +44,6 @@ default.app.name=${default.app.name}
# <url>[,<username>,<password>];\ (username/password currently not encrypted)
proxy.allowedServerUrls=${proxy.allowedServerUrls}

# the following is support for proxied ssl connections
# if you configure '*' then you trust all ssl server certificates
# you can also confige the dns of the certificate subjects to trust them, separated by '|'
# or leave the configuration empty, then the normal java mechanism is used.
proxy.allowedSSLDNs=${proxy.allowedSSLDNs}

# Defines rules for proxy access based on host names.
# It provides more fine grained control what requests use a proxy page.
# Sample:
Expand All @@ -70,16 +61,6 @@ proxy.use.rules=${proxy.use.rules}
# http://servicesbeta.esri.com,http://server.organization.com
cors.request.trustedServers=${cors.request.trustedServers}

jsregistry.replacement.paths=**/tests/*.html

jsregistry.directoryscanner.npmfolder=${basedir}/node_modules
jsregistry.directoryscanner.npmincludes=mocha,chai,@conterra,@conterra/mapapps-mocha-runner

# Set to true to allow that *.js.map files are delivered. Default is false.
# This option should be set to true only for stage or development systems.
# It allows better debugging of errors, but may open details of the JavaScript Source code to attackers.
jsregistry.sourcemaps.enabled=true

# Enable debug logging (in browser console).
client.config.logging=DEBUG

Expand All @@ -106,5 +87,3 @@ security.identity.self.service.url=$\{security.self.service.url\}
#security.login.base=http://localhost:8080
#esri.api.arcgisPortalUrl=https://myhost.example.com/portal
#proxy.allowedServerUrls=http://localhost:8080/**,trusted:true;


0 comments on commit 7f6dc6a

Please sign in to comment.