diff --git a/.eslintrc b/.eslintrc index c20bc85..ae8ae61 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,6 +1,6 @@ { - "extends": "eslint-config-ct-prodeng", - "plugins": [ - "vue" - ] + "extends": "eslint-config-ct-prodeng", + "plugins": [ + "vue" + ] } diff --git a/.gitignore b/.gitignore index cc762e4..e41ab5f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /.vscode/settings.json /.externalToolBuilders/ /package-lock.json +/gulpfile.overrides.js diff --git a/.stylelintignore b/.stylelintignore new file mode 100644 index 0000000..b07fa47 --- /dev/null +++ b/.stylelintignore @@ -0,0 +1,3 @@ +# add path patterns to ignore style files +**/external-libs/** +**/styles/dijit/** \ No newline at end of file diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 0000000..57c90c1 --- /dev/null +++ b/.stylelintrc @@ -0,0 +1,3 @@ +{ + "extends": "stylelint-config-ct-prodeng" +} diff --git a/README.md b/README.md index 571817c..fe7456d 100644 --- a/README.md +++ b/README.md @@ -1,247 +1,22 @@ -# mapapps-remote-project-blueprint +# mapapps-lineofsight -This project is a blueprint for starting a con terra developer network bundle +The LineOfSight widget is a 3D analysis tool that allows you to perform visibility analysis in a SceneView. Visibility +between a given observer and multiple target points is calculated against the currently displayed content in the view, +including ground, integrated meshes and 3D objects such as buildings or trees. -## Build +## Quick start -![example workflow](https://github.com/conterra/mapapps-remote-project-blueprint/actions/workflows/devnet-bundle-snapshot.yml/badge.svg) +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)). -## Requirements +Then run the following commands from the project root directory to start a local development server: -- map.apps 4.12.3 -- All resources from `map.apps-VERSION/sdk/m2-repository` need to be copied manually to your local Maven repository (e.g. `%UserProfile%/.m2/repository` for Windows, `~/.m2/repository` for MacOS). +```bash +# install all required node modules +$ mvn initialize -## Usage +# start dev server +$ mvn compile -Denv=dev -Pinclude-mapapps-deps -The project supports a 'remote project' and 'standalone project' mode. - -### Use 'remote project' mode - -In this mode a running map.apps installation must be available on a different machine or server and the map.apps core JavaScript resources are fetched from there. -This mode is the recommended one. - -The URL to the existing map.apps installation can be configured inside the `pom.xml` file of this project: - -Replace - -```xml - . +# run unit tests +$ mvn test -P run-js-tests,include-mapapps-deps ``` - -with - -```xml - http://yourserver/mapapps -``` - -As an alternative, the URL can be declared in a file called `build.properties` with the content - -```properties -mapapps.remote.base=http://yourserver/mapapps -``` - -The "env-dev" Maven profile must be activated when using a `build.properties` file. To activate this profile append `-P env-dev` or `-Denv=dev` to any Maven execution or declare the profile as activated by default in your Maven `settings.xml` file. - -### Use 'stand-alone project' mode - -In this mode all JavaScript sources are added to this project during development. -The drawback of this mode is that you cannot test authentication and that the default settings are not read from the remote instance. - -To use the 'stand-alone project' mode, activate the Maven profile `include-mapapps-deps`: Append `-P include-mapapps-deps` to any Maven execution command or declare the profile as activated by default in your Maven `settings.xml`. - -When developing live-configuration widgets in Chrome, this mode is compelling. - -### Start a local HTTP server - -Start the integrated Jetty server with: - -```sh -mvn clean jetty:run -P watch-all -``` - -Make sure that the `watch-all` Maven profile is activated. -The profile will start a gulp task that watches for changes in your source code. - -The Jetty server is then available at [http://localhost:9090](http://localhost:9090). - -### Skip installation of Node.js and NPM during Maven execution - -By appending `-Denv=dev -Dlocal.configfile=./build.properties` to any Maven execution the development mode is activated. -This means: - -- Node.js and NPM are not installed -- the `watch-all` profile is activated -- the `build.properties` file is loaded - -To enforce the installation of Node.js and NPM execute: - -```sh -mvn initialize -``` - -This triggers the installation of Node.js and NPM exclusively. - -### Start coding - -For detailed documentation on how to develop for map.apps go to the [conterra Developer Network](https://developernetwork.conterra.de/de/documentation/mapapps/development-guide) (registration required). - -### Make your code production ready - -Execute the following command to ensure that all files are compressed/minified and a `dependencies.json` file is calculated: - -```sh -mvn clean install -P compress -``` - -### Upload your code to a map.apps installation - -To upload your apps and bundles after compression to an existing map.apps installation activate the `upload` profile: - -```sh -mvn clean install -P compress,upload -Dmapapps.user=xyz -Dmapapps.pw=abc -``` - -If map.apps is running behind an IIS with Integrated Windows authentication then do not configure `-Dmapapps.user` and `-Dmapapps.pw`. -Instead configure `-Dmapapps.useChunkedRequestEncoding=true` and `-Djdk.http.ntlm.transparentAuth=trustedHosts` (or `-Djdk.http.ntlm.transparentAuth=allHosts`) to ensure the user's Windows credentials are used. - -### Running the tests - -To execute the unit tests inside the project, run [http://localhost:9090/js/tests/runTests.html](http://localhost:9090/js/tests/runTests.html). - -Or use the test lifecycle: - -```sh -mvn clean test -P run-js-tests,include-mapapps-deps -``` - -> If you run the project in 'remote project' mode, you will have to edit the `test-init.js` file located in the `/src/test/webapp/js/tests/` folder. - -### The 'sample_camera' bundle - -There is a sample bundle in this project called "sample_camera" which demonstrates the following aspects of developing for map.apps 4: - -- Interaction with ESRI map -- Use of Binding (e.g. with Accessor) -- Building widgets with Vue.js and Vuetify.js - -### The 'theme-custom' bundle - -- Sample of minimum fileset needed to create a custom theme. -- Make sure bundle is loaded instead of theme-everlasting in sample app -- When renaming/copying the 'theme-custom' bundle to e.g. `theme-[projectname]` make sure to also make the corresponding changes to the following files: - - - `gulpfile.js` - - `theme-name/manifest.json` - - `theme-name/styles/styles.less` - -### Build Process - -- The gulpfile that describes the build process for map.apps themes can be found in the root directory: `/gulpfile.js` -- The `/package.json` file contains the version numbers for the required dependencies for the gulp build process. - -## Updating from older versions - -### from 4.12.1 to 4.12.2 - -See [Changelog](./CHANGELOG.md) - -### from 4.12.0 to 4.12.1 - -See [Changelog](./CHANGELOG.md#4121---10112021) - -### from 4.11.1 to 4.12.0 - -See [Changelog](./CHANGELOG.md#4120---2021-08-31) - -### from 4.11.0 to 4.11.1 - -See [Changelog](./CHANGELOG.md#4111) - -### from 4.10.1 to 4.11.0 - -See [Changelog](./CHANGELOG.md#4110) - -### from 4.10.0 to 4.10.1 - -See [Changelog](./CHANGELOG.md#4100---2020-12-09) - -### from 4.9.2 to 4.10.0 - -See [Changelog](./CHANGELOG.md#4100---2020-12-08) - -### from 4.9.1 to 4.9.2 - -See [Changelog](./CHANGELOG.md#492---2020-10-06) - -### from 4.9.0 to 4.9.1 - -See [Changelog](./CHANGELOG.md#491---2020-09-04) - -### from 4.8.4 to 4.9.0 - -See [Changelog](./CHANGELOG.md#490---2020-08-18) - -### from 4.8.3 to 4.8.4 - -See [Changelog](./CHANGELOG.md#484---2020-05-20) - -### from 4.8.2 to 4.8.3 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.8.3` -2. Adjust the versions in `devDependencies` in `./package.json` according to the list below: - * "ct-mapapps-gulp-js": "^0.3.6" - -### from 4.8.1 to 4.8.2 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.8.2` -2. Change the requirement `babel-polyfill` to `apprt-polyfill` in the `./pom.xml` and `src/test/webapp/js/tests/test-init.js`. -3. Replace `$apprt.load` and `$apprt.lauchAppFromParam` by `$apprt.startApp` in the `src/test/webapp/index.html` - -### from 4.8.0 to 4.8.1 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.8.1` - -### from 4.7.2 to 4.8.0 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.8.0` -2. Adjust the `ct.jsregistry.version` property in `./pom.xml` to `1.3.4` -3. Adjust the versions in `devDependencies` in `./package.json` according to the list below: - * "ct-mapapps-gulp-js": "^0.2.5" - -### from 4.7.1 to 4.7.2 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.7.2` -2. Adjust the `ct.jsregistry.version` property in `./pom.xml` to `1.3.2` -3. Add the version hint `${ct.jsrt-test.version}` for dependencies `ct-jsrt-test-intern` and `ct-jsrt-test-uitest` in `pom.xml` -4. Update the Gulpfile and remove the dev dependencies from `gulpfile.js`. For details see [commit](https://github.com/conterra/mapapps-4-developers/commit/c974a74a08a70316204d5c09aee22f8d39c70446) - -### from 4.7.0 to 4.7.1 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.7.1` -2. Adjust the `ct.jsregistry.version` property in `./pom.xml` to `1.3.1` - -### from 4.6.1 to 4.7.0 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.7.0` -2. Adjust the `ct.jsregistry.version` property in `./pom.xml` to `1.3.0` -3. Adjust the versions in `devDependencies` in `./package.json` according to the list below: - * "eslint-config-ct-prodeng": "^1.0.5" - * "vue-template-compiler": "2.6.6" - -### from 4.6.0 to 4.6.1 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.6.1` - -### from 4.5.0 or below to 4.6.0 - -1. Adjust the `mapapps.version` property in `./pom.xml` to `4.6.0` -2. Adjust the versions in `devDependencies` in `./package.json` according to the list below: - * "ct-mapapps-gulp-js": "~0.1.3" - * "vue-template-compiler": "2.5.17" -3. Go to `./src/test/webapp/index.html` and replace the `corsEnabledServers: ["@@mapapps.remote.base@@"]` with `trustedServers: ["@@mapapps.remote.base@@"]` inside the apprt request configuration object. - -## References - -* [Vue.js](https://vuejs.org) -* [Vuetify.js](https://vuetifyjs.com) -* [Gulp](http://gulpjs.com) diff --git a/RELEASE.md b/RELEASE.md index 9cd3ea3..b14d54e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -✅ Tested for map.apps 4.12.3 / Linie 4 +✅ Tested for map.apps 4.18.1 / Linie 4 #### Release Notes -- SNAPSHOT-Release +- autogenerated SNAPSHOT-Release diff --git a/build.properties b/build.properties index 42ee3d5..e97229c 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 con terra GmbH (info@conterra.de) +# Copyright (C) 2023 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 index 8852c69..4df9281 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 con terra GmbH (info@conterra.de) + * Copyright (C) 2023 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,38 +15,165 @@ */ const gulp = require("gulp"); const mapapps = require('ct-mapapps-gulp-js'); +const mapappsBrowserSync = require("ct-mapapps-browser-sync"); + +const isProduction = process.env.NODE_ENV === "production"; +console.info(`Configuring gulp build for ${isProduction ? "production" : "development"}`); + +const localOverrides = (function () { + if (isProduction) { + // Never override defaults in production mode + return undefined; + } + + try { + return require("./gulpfile.overrides"); + } catch (e) { + // File may not exist + return undefined; + } +})(); + +// used to transport test urls in "run-browser-tests-local" task +const runBrowserTests = []; mapapps.registerTasks({ + /** Enable debug logging */ + debug: localOverrides?.debug ?? false, + /** enable linting */ + lintOnWatch: localOverrides?.lintOnWatch ?? true, + /** enable es6 by default */ + forceTranspile: true, /* A detailed description of available setting is available at https://www.npmjs.com/package/ct-mapapps-gulp-js */ + compress: isProduction, + + /* build source maps as e.g. ".js.map" */ + sourceMaps: "file", + + /** Build Unit-Tests only in dev mode */ + rollupBuildTests: !isProduction, + /** Amount of Threads used to build the bundles, if there are only a few bundles 1 is ok. + * More as 3 is normally not required. + */ + rollupBuildMaxWorkers: localOverrides?.rollupBuildMaxWorkers ?? 1, + + /** List of build time flags, usage like: import { debug } from "build-config!". + */ + rollupConfig: { + debug: !isProduction + }, + /* 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 the vuetify core styles*/ + /* state that we want to support vuetify components and therefore need the vuetify core styles*/ hasVuetify: true, - /*themeChangeTargets: { - "vuetify": [ - "sample_theme" + themeChangeTargets: { + "vuetify": [] + }, + /* A list oft target browser versions. This should be streamlined with Esri JS API requirements. */ + transpileTargets: { + firefox: 102, + edge: 104, + chrome: 104, + safari: 15 + }, + runBrowserTests, + watchFinishedReceiver() { + if (localOverrides?.autoReload ?? true) { + mapappsBrowserSync.state.reload(); + } + } +}, gulp); + +mapappsBrowserSync.registerTask({ + // on which port to listen + port: localOverrides?.port ?? 9090, + // activate https protocol, generates a self signed certificate for "localhost" + // https://browsersync.io/docs/options#option-https + https: localOverrides?.https ?? false, + + // 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: [ + "mocha", + "chai", + "@conterra/mapapps-mocha-runner" ] - }*/ -}); + }, + // prevent reload by browser sync (reload triggered on watch end) + externalReloadTrigger: true +}, gulp); -gulp.task("default", +gulp.task("build", gulp.series( "copy-resources", "themes-copy", gulp.parallel( - //"js-lint", - //"style-lint", "js-transpile", + "rollup-build", "themes-compile" ) ) ); +gulp.task("lint", + gulp.parallel( + "js-lint" + /*, comment in to lint .css/.less files + "style-lint" + */ + )); + +gulp.task("preview", + gulp.series( + "build", + gulp.parallel( + "watch", + "browser-sync" + ) + )); + +gulp.task("run-tests", + gulp.series( + "browser-sync-start", + function transportTestUrls() { + // transport test url to run-browser-tests + // eslint-disable-next-line max-len + const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_lineofsight/tests/all&reporter=tap"; + runBrowserTests.push(testsAt); + return Promise.resolve(); + }, + "run-browser-tests", + "browser-sync-stop" + )); + +gulp.task("test", + gulp.series( + "build", + "lint", + "run-tests" + )); + gulp.task("compress", gulp.series( - "default", - "themes-compress" + "build", + "themes-compress", + "lint" ) ); + +gulp.task("default", + gulp.series( + "build", + "lint" + )); diff --git a/package.json b/package.json index b851ad9..6c71dea 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,36 @@ { - "name": "test", + "name": "mapapps-4-developers", "description": "test build", "version": "0.0.1", + "license": "CC0-1.0", + "scripts": { + "check-licenses": "tsx ./src/support/js/check-licenses.ts", + "check-types": "tsc --noEmit", + "watch-types": "tsc -w --noEmit" + }, "devDependencies": { - "@conterra/ct-mapapps-typings": "~4.12.0", - "@conterra/mapapps-mocha-runner": "^1.0.0", - "@types/arcgis-js-api": "4.20.1", - "ct-mapapps-gulp-js": "^0.5.27", - "vue-template-compiler": "2.6.14", - "puppeteer": "^10.0.0", - "eslint-config-ct-prodeng": "^1.2.4", - "stylelint-config-ct-prodeng": "1.0.3", - "chai": "^4.3.4", - "mocha": "^9.0.0" + "@conterra/ct-mapapps-typings": "~4.18.1", + "@conterra/mapapps-mocha-runner": "1.1.1", + "@conterra/reactivity-core": "^0.4.0", + "@types/chai": "4.3.10", + "@types/license-checker": "^25.0.6", + "@types/mocha": "10.0.4", + "arcgis-js-api": "4.29.10", + "chai": "4.3.10", + "ct-mapapps-browser-sync": "0.0.39", + "ct-mapapps-gulp-js": "0.10.3", + "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.4.5", + "vue": "2.7.15", + "vue-template-compiler": "2.7.15" } } diff --git a/pom.xml b/pom.xml index 8a60416..8e84fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 de.conterra.devnet mapapps-lineofsight @@ -49,16 +50,6 @@ - - de.conterra.jsregistry - ct-jsregistry-embedded - test - - - de.conterra.ct-proxy - ct-proxy-servlet - test - org.vuejs @@ -86,7 +77,6 @@ ${ct.jsrt-test.version} test - @@ -130,6 +120,8 @@ apps/** **/tests/** + **/sample_tests/** + **/theme-common/** @@ -137,21 +129,6 @@ maven-war-plugin 3.2.3 - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - org.eclipse.jetty - jetty-maven-plugin - 9.4.17.v20190418 - - - jar - - - org.codehaus.mojo properties-maven-plugin @@ -165,10 +142,9 @@ com.github.eirslett frontend-maven-plugin - 1.10.0 + 1.14.2 - v14.15.1 - 6.14.9 + v20.9.0 @@ -194,21 +170,9 @@ setproperties-maven-plugin 1.0.2 - - de.conterra.jsrt - ct-jsrt-test-maven-plugin - ${ct.jsrt-test.version} - src/main/js - - - src/main/js - ${js.build.outputPath} - false - - src/test/resources @@ -231,6 +195,29 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce-versions + + enforce + + + + + [3.8.0,) + + + [17,) + + + + + + de.conterra.maven setproperties-maven-plugin @@ -243,9 +230,7 @@ - - . @@ -253,7 +238,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.11.0 true @@ -261,7 +246,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.5.0 true @@ -269,6 +254,7 @@ org.apache.maven.plugins maven-dependency-plugin + 3.5.0 unpack-themes-src @@ -281,8 +267,7 @@ de.conterra.mapapps - ct-mapapps-js-api - ${mapapps.version} + ct-mapapps-js src ${project.build.directory}/unpacked layout/theme-everlasting/**,layout/theme-common/** @@ -300,61 +285,32 @@ + + copy js-libs into 'bundle-imports' + generate-resources + + copy-dependencies + + + ${project.build.directory}/bundle-imports + + org.apache.maven.plugins maven-resources-plugin - - UTF-8 - - - - de.conterra.jsregistry - ct-jsregistry-maven-plugin - build-jsregistry.properties - process-resources + - buildPacksProperties + testResources + process-resources - ${js.build.outputPath} - ${js.build.outputPath} - - - - org.eclipse.jetty - jetty-maven-plugin - - - ${jetty.port} - - 9966 - jetty-stop - 60000 - 0 - manual - ${basedir}/src/test/webapp/WEB-INF/web.xml - true - - / - - ${root.build.outputPath},${basedir}/src/test/webapp - - - .*/ct-jsregistry-embedded-[^/]*\.jar$ - - - - - catalina.base - ${project.build.directory} - - + UTF-8 @@ -362,23 +318,17 @@ frontend-maven-plugin + run gulp ${gulp.task} gulp + process-resources ${gulp.task} - - - - - watch-changes - - gulp - - none - - watch + + ${gulp.node.env} + @@ -391,7 +341,7 @@ con terra GmbH info@conterra.de - 2021 + 2023 src/main/js/**/*.js @@ -407,6 +357,9 @@ **/gulpfile.js **/pom.xml + + src/main/js/**/*.min.js + XML_STYLE @@ -439,18 +392,47 @@ - \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s* - - + + \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s* + + + de.conterra.jsregistry + ct-jsregistry-maven-plugin + + + build-jsregistry.properties + process-resources + + buildPacksProperties + + + + apps/**,bundles/sample_tests + + + + + ${js.build.outputPath} + ${js.build.outputPath} + + de.conterra.mapapps mapapps-maven-plugin + + + true + false + ${js.build.outputPath}/apps + ${project.build.directory} + @@ -478,13 +460,6 @@ - - - true - false - ${js.build.outputPath}/apps - ${project.build.directory} - maven-assembly-plugin @@ -535,33 +510,42 @@ UTF-8 - ${project.build.directory}/webapp ${root.build.outputPath}/js - 4.12.3 + 4.18.1 + 1.5.30 ${mapapps.version} - 1.4.4 + 2.1.1 2.0.2 sample - + *://*:*/**; * - 9090 + $\{mapapps.remote.base\} + mvn + development + + + + + + + - - - + true false @@ -569,80 +553,12 @@ false - - run-js-tests - - - - org.codehaus.mojo - build-helper-maven-plugin - - - reserve-jetty-port - - reserve-network-port - - process-test-resources - - - jetty.server.port - - - - - - - org.eclipse.jetty - jetty-maven-plugin - - - jetty-start - process-test-classes - - start - - - - ${jetty.server.port} - - 0 - true - - - - jetty-stop - prepare-package - - stop - - - - - - com.github.eirslett - frontend-maven-plugin - - - run gulp js tests - test - - gulp - - - run-browser-tests --tests http://localhost:${jetty.server.port}/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_lineofsight/tests/all&reporter=tap - - - - - - - include-mapapps-deps de.conterra.mapapps - ct-mapapps-js-api + ct-mapapps-js test @@ -665,6 +581,11 @@ ags-js-api4 test + + com.esri + terraformer-js + test + moment-js moment-js @@ -675,6 +596,11 @@ apprt-polyfill test + + de.conterra.js + reactivity + test + @@ -716,8 +642,8 @@ env-dev @@ -727,9 +653,8 @@ ${basedir}/build.properties - + + preview @@ -755,89 +680,16 @@ - watch-all - - - env - dev - - - - - - org.codehaus.mojo - exec-maven-plugin - - - trigger-watch-changes - test-compile - - exec - - - true - ${maven.home}/bin/${mvn.cmd} - - com.github.eirslett:frontend-maven-plugin:gulp@watch-changes - - - - - - - - - - write-release-versions + run-js-tests - ${project.version} - ${project.version} + test - - - - - com.google.code.maven-replacer-plugin - replacer - - - - Set Versions from ${replace.source.version} to ${replace.target.version} - validate - - replace - - - ${basedir} - - src/main/js/**/manifest.json - src/main/js/**/package.json - - - src/main/js/**/tests/** - - false - - - "${replace.source.version}" - "${replace.target.version}" - - - "~${replace.source.version}" - "~${replace.target.version}" - - - - - - - - compress compress + production @@ -857,23 +709,23 @@ calculateDependencies + @@ -895,6 +747,7 @@ ${mapapps.remote.base}/resources ${mapapps.user} ${mapapps.pw} + ${mapapps.token} ${mapapps.useChunkedRequestEncoding} ${triggerPreOptimization} @@ -904,7 +757,7 @@ ct-jsregistry-maven-plugin - deploy bundles + deploy-bundles deployJSPackage @@ -912,6 +765,7 @@ ${mapapps.remote.base}/resources/jsregistry ${mapapps.user} ${mapapps.pw} + ${mapapps.token} ${mapapps.useChunkedRequestEncoding} @@ -921,26 +775,54 @@ - windows - - - Windows - - - - mvn.cmd - - - - unix - - - unix - - + write-release-versions - mvn + ${project.version} + ${project.version} + + + + + com.google.code.maven-replacer-plugin + replacer + + + + Set Versions from ${replace.source.version} to ${replace.target.version} + validate + + replace + + + ${basedir} + + src/main/js/**/manifest.json + + + src/main/js/**/tests/** + + false + + + "${replace.source.version}" + "${replace.target.version}" + + + "~${replace.source.version}" + "~${replace.target.version}" + + + ^${replace.source.version} + ^${replace.target.version} + + + + + + + + diff --git a/src/main/config/assembly.xml b/src/main/config/assembly.xml index 9c6c27f..0441c06 100644 --- a/src/main/config/assembly.xml +++ b/src/main/config/assembly.xml @@ -1,6 +1,6 @@ @@ -19,4 +19,16 @@ /proxy + + + + default + + useFileMappedBuffer + false + + + diff --git a/src/test/webapp/favicon.png b/src/test/webapp/favicon.png new file mode 100644 index 0000000..899ca55 Binary files /dev/null and b/src/test/webapp/favicon.png differ diff --git a/src/test/webapp/index.html b/src/test/webapp/index.html index 2820d30..3095995 100644 --- a/src/test/webapp/index.html +++ b/src/test/webapp/index.html @@ -1,6 +1,6 @@ @@ -42,7 +42,7 @@ overflow: hidden; } - map.apps remote sample + map.apps sample