Skip to content

Commit

Permalink
Update to map.apps 4.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthiasstein
matthiasstein committed Mar 16, 2021
1 parent 95707da commit 1a25949
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 179 deletions.
5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"description": "test build",
"version": "0.0.1",
"devDependencies": {
"@types/arcgis-js-api": "4.17.0",
"ct-mapapps-gulp-js": "^0.5.6",
"@conterra/ct-mapapps-typings": "~4.11.1",
"@types/arcgis-js-api": "4.18.0",
"ct-mapapps-gulp-js": "^0.5.14",
"vue-template-compiler": "2.6.6",
"puppeteer": "^5.5.0",
"eslint-config-ct-prodeng": "^1.1.16",
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,12 +545,12 @@
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>

<mapapps.version>4.10.1</mapapps.version>
<mapapps.version>4.11.1</mapapps.version>
<!-- JS lib versions -->
<apprt.version>${mapapps.version}</apprt.version>
<!-- java lib versions -->
<ct.jsregistry.version>1.3.10</ct.jsregistry.version>
<ct.jsrt-test.version>1.1.5</ct.jsrt-test.version>
<ct.jsregistry.version>1.4.1</ct.jsregistry.version>
<ct.jsrt-test.version>2.0.0</ct.jsrt-test.version>

<!-- the default app, replaced in the *.html files to switch app names-->
<default.app.name>sample</default.app.name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_hierarchicalsearch/tests/all.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 con terra GmbH (info@conterra.de)
* Copyright (C) 2021 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.
Expand Down
212 changes: 108 additions & 104 deletions src/test/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,115 @@
<!DOCTYPE html>
<html>

<head>
<!-- this is required to let ace editor work in IE 8 and 7 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<meta charset="UTF-8" />
<meta name="robots" content="nofollow" />
<meta name="copyright" content="con terra GmbH" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" />
<link rel="icon" href="@@mapapps.remote.base@@/favicon.ico" type="image/x-icon" />
<!--Import the init_night.css if you wish the map.apps 2.x default splashscreen
<link type="text/css" rel="stylesheet" href="init_night.css"/>-->
<link type="text/css" rel="stylesheet" href="@@mapapps.remote.base@@/init.css" />
<style type="text/css">
html,
body {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}
</style>
<title>map.apps remote sample</title>
<script type="text/javascript" src="@@client.config.initjs@@"></script>
<script type="text/javascript">
var proxyrules = [];
var proxyUrl = "@@applicationURL.noscheme@@/proxy";
"@@proxy.use.rules@@".split(/\s*,\s*/).forEach(function (rule) {
var rule = rule.split(/\s*\|\s*/);
var origin = rule[0];
if (!origin || origin.startsWith("@")){
return;
<head>
<!-- this is required to let ace editor work in IE 8 and 7 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<meta charset="UTF-8" />
<meta name="robots" content="nofollow" />
<meta name="copyright" content="con terra GmbH" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" />
<link rel="icon" href="@@mapapps.remote.base@@/favicon.ico" type="image/x-icon" />
<!--Import the init_night.css if you wish the map.apps 2.x default splashscreen
<link type="text/css" rel="stylesheet" href="init_night.css"/>-->
<link type="text/css" rel="stylesheet" href="@@mapapps.remote.base@@/init.css" />
<style type="text/css">
html,
body {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}
var url = rule[1] || proxyUrl;
proxyrules.push({
origin: origin,
proxyUrl: url
});
});
$apprt.changeConfig({
isDebug: true,
has: {
"ct-debug": true,
"ct-log-deprecations": true
},
ct: {
amdPackages: ["apprt@^@@apprt.version@@"],
preFetchBundles: false
},
apprt: {
request: {
trustedServers: ["@@mapapps.remote.base@@"],
proxyUrl: proxyUrl,
proxyRules: proxyrules
</style>
<title>map.apps remote sample</title>
<script type="text/javascript" src="@@client.config.initjs@@"></script>
<script type="text/javascript">
var proxyrules = [];
var proxyUrl = "@@applicationURL.noscheme@@/proxy";
"@@proxy.use.rules@@".split(/\s*,\s*/).forEach(function (rule) {
var rule = rule.split(/\s*\|\s*/);
var origin = rule[0];
if (!origin || origin.startsWith("@")){
return;
}
},
packages: [
// add local apps directory as amd package
{ name: "localapps", location: "@@applicationURL.noscheme@@/js/apps" },
// add local bundles directory as amd package
{ name: "localbundles", location: "@@jsregistry.root.url@@" }
]
});
$apprt.startApp({
configLocation: "localapps",
param: "app",
defaultApp: "@@default.app.name@@"
});
</script>
</head>

<body class="start">
<div class="startLogo"></div>
<div id="splashScreen" class="splashScreen">
<div class="launch__animation">
<div class="dot-outer">
<div class="dot dot-1"></div>
</div>
<div class="dot-outer">
<div class="dot dot-2"></div>
</div>
<div class="dot-outer">
<div class="dot dot-3"></div>
</div>
<div class="dot-outer">
<div class="dot dot-4"></div>
</div>
<div class="dot-outer">
<div class="dot dot-5"></div>
</div>
<div class="dot-outer">
<div class="dot dot-6"></div>
var url = rule[1] || proxyUrl;
proxyrules.push({
origin: origin,
proxyUrl: url
});
});
$apprt.changeConfig({
isDebug: true,
has: {
"ct-debug": true,
"ct-log-deprecations": true
},
ct: {
amdPackages: ["apprt@^@@apprt.version@@"],
preFetchBundles: false
},
apprt: {
request: {
trustedServers: ["@@mapapps.remote.base@@"],
proxyUrl: proxyUrl,
proxyRules: proxyrules
}
},
packages: [
// add local apps directory as amd package
{ name: "localapps", location: "@@applicationURL.noscheme@@/js/apps" },
// add local bundles directory as amd package
{ name: "localbundles", location: "@@jsregistry.root.url@@" }
]
});
$apprt.startApp({
configLocation: "localapps",
param: "app",
defaultApp: "@@default.app.name@@"
});
</script>
</head>
<body class="start">
<div id="splashScreen" class="ct-splashscreen ct-splashscreen--dark splashScreen">
<div class="ct-splashscreen-header"></div>
<div class="ct-splashscreen-main">
<div class="startLogo"></div>
<div class="ct-splashscreen-stage">
<div class="launch__animation">
<div class="dot-outer">
<div class="dot dot-1"></div>
</div>
<div class="dot-outer">
<div class="dot dot-2"></div>
</div>
<div class="dot-outer">
<div class="dot dot-3"></div>
</div>
<div class="dot-outer">
<div class="dot dot-4"></div>
</div>
<div class="dot-outer">
<div class="dot dot-5"></div>
</div>
<div class="dot-outer">
<div class="dot dot-6"></div>
</div>
</div>
<div class="launch__title">
<h4 class="splashHeader">
<span class="launchLog"></span>
</h4>
</div>
<div class="launch__bundles">
<p class="splashBundle">&nbsp;</p>
</div>
</div>
</div>
<div class="ct-splashscreen-footer"></div>
</div>
</div>
<div class="launch__title">
<h4 class="splashHeader">
<span class="launchLog"></span>
</h4>
</div>
<div class="launch__bundles">
<p class="splashBundle">&nbsp;</p>
</div>
</div>
</body>

</body>
</html>
Loading

0 comments on commit 1a25949

Please sign in to comment.